From 86b68e661213dee98749d77cb98bdf4fac18ddda Mon Sep 17 00:00:00 2001
From: Jason San Jose <jasonsj@adobe.com>
Date: Wed, 3 Dec 2014 16:43:19 -0800
Subject: [PATCH 01/15] fix some linux compile issues with CEF 2171

---
 appshell/appshell_extensions_platform.h | 30 ++++++++++++---------
 appshell/cefclient.cpp                  |  4 +--
 appshell/cefclient.h                    |  3 ++-
 appshell/cefclient_gtk.cpp              | 26 +++++++++---------
 appshell/client_handler.cpp             | 36 ++++++++++++-------------
 appshell/client_handler.h               | 36 ++++++++++++++-----------
 6 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/appshell/appshell_extensions_platform.h b/appshell/appshell_extensions_platform.h
index 518755399..068d83c9d 100644
--- a/appshell/appshell_extensions_platform.h
+++ b/appshell/appshell_extensions_platform.h
@@ -1,25 +1,25 @@
 /*
  * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
- */ 
+ *
+ */
 
 #pragma once
 
@@ -28,6 +28,10 @@
 
 #include <string>
 
+#ifdef OS_LINUX
+#include <gtk/gtk.h>
+#endif
+
 // Extension error codes. These MUST be in sync with the error
 // codes in appshell_extensions.js
 #if !defined(OS_WIN) // NO_ERROR is defined on windows
diff --git a/appshell/cefclient.cpp b/appshell/cefclient.cpp
index 4058b297b..1598ab642 100644
--- a/appshell/cefclient.cpp
+++ b/appshell/cefclient.cpp
@@ -28,9 +28,9 @@ CefRefPtr<CefBrowser> AppGetBrowser() {
   return g_handler->GetBrowser();
 }
 
-CefWindowHandle AppGetMainHwnd() {
+ClientWindowHandle AppGetMainHwnd() {
   if (!g_handler.get())
-    return NULL;
+    return kNullWindowHandle;
   return g_handler->GetMainHwnd();
 }
 
diff --git a/appshell/cefclient.h b/appshell/cefclient.h
index 67120d066..23ec798cb 100644
--- a/appshell/cefclient.h
+++ b/appshell/cefclient.h
@@ -9,6 +9,7 @@
 #include <string>
 #include "include/cef_base.h"
 #include "client_app.h"
+#include "client_handler.h"
 
 class CefApp;
 class CefBrowser;
@@ -18,7 +19,7 @@ class CefCommandLine;
 CefRefPtr<CefBrowser> AppGetBrowser();
 
 // Returns the main application window handle.
-CefWindowHandle AppGetMainHwnd();
+ClientWindowHandle AppGetMainHwnd();
 
 // Returns the application working directory.
 std::string AppGetWorkingDirectory();
diff --git a/appshell/cefclient_gtk.cpp b/appshell/cefclient_gtk.cpp
index ca8630dd9..2aa6aa54c 100644
--- a/appshell/cefclient_gtk.cpp
+++ b/appshell/cefclient_gtk.cpp
@@ -2,6 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
+#include <gdk/gdkx.h>
+
 #include "cefclient.h"
 #include <gtk/gtk.h>
 #include <stdlib.h>
@@ -54,7 +56,7 @@ void HandleAdd(GtkContainer *container,
 static gboolean HandleQuit(int signatl) {
   if (!isReallyClosing && g_handler.get() && g_handler->GetBrowserId()) {
     CefRefPtr<CommandCallback> callback = new CloseWindowCommandCallback(g_handler->GetBrowser());
-    
+
     g_handler->SendJSCommand(g_handler->GetBrowser(), FILE_CLOSE_WINDOW, callback);
     return TRUE;
   }
@@ -76,7 +78,7 @@ int GetInitialUrl() {
                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                           GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                           NULL);
-     
+
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
       {
         szInitialUrl = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
@@ -171,19 +173,19 @@ int main(int argc, char* argv[]) {
   if (CefString(&settings.cache_path).length() == 0) {
     CefString(&settings.cache_path) = AppGetCachePath();
   }
-  
+
   CefRefPtr<CefCommandLine> cmdLine = AppGetCommandLine();
-  
+
   if (cmdLine->HasSwitch(cefclient::kStartupPath)) {
     szInitialUrl = cmdLine->GetSwitchValue(cefclient::kStartupPath);
   } else {
     szInitialUrl = AppGetRunningDirectory();
     szInitialUrl.append("/dev/src/index.html");
-  
+
     if (!FileExists(szInitialUrl)) {
       szInitialUrl = AppGetRunningDirectory();
       szInitialUrl.append("/www/index.html");
-  
+
       if (!FileExists(szInitialUrl)) {
         if (GetInitialUrl() < 0)
           return 0;
@@ -193,17 +195,17 @@ int main(int argc, char* argv[]) {
 
   // Initialize CEF.
   CefInitialize(main_args, settings, app.get(), NULL);
-  
+
   // Set window icon
   std::vector<std::string> icons(APPICONS, APPICONS + sizeof(APPICONS) / sizeof(APPICONS[0]) );
   GList *list = NULL;
   for (int i = 0; i < icons.size(); ++i) {
     std::string path = icons[i];
-    
+
     GdkPixbuf *icon = gdk_pixbuf_new_from_file(path.c_str(), NULL);
     if (!icon)
        continue;
-    
+
     list = g_list_append(list, icon);
   }
 
@@ -211,7 +213,7 @@ int main(int argc, char* argv[]) {
   gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
 
   gtk_window_set_icon_list(GTK_WINDOW(window), list);
-  
+
   // Free icon list
   g_list_foreach(list, (GFunc) g_object_unref, NULL);
   g_list_free(list);
@@ -244,7 +246,7 @@ int main(int argc, char* argv[]) {
 
   browserSettings.web_security = STATE_DISABLED;
 
-  window_info.SetAsChild(vbox);
+  window_info.SetAsChild(GDK_WINDOW_XID(gtk_widget_get_window(vbox)), CefRect(0, 0, 800, 600));
 
   CefBrowserHost::CreateBrowser(
       window_info,
@@ -257,7 +259,7 @@ int main(int argc, char* argv[]) {
   // Install an signal handler so we clean up after ourselves.
   signal(SIGINT, TerminationSignalHandler);
   signal(SIGTERM, TerminationSignalHandler);
-    
+
   // Start the node server process
   startNodeProcess();
 
diff --git a/appshell/client_handler.cpp b/appshell/client_handler.cpp
index 50a0fe231..3f2199f24 100644
--- a/appshell/client_handler.cpp
+++ b/appshell/client_handler.cpp
@@ -46,26 +46,26 @@ bool ClientHandler::OnProcessMessageReceived(
     CefProcessId source_process,
     CefRefPtr<CefProcessMessage> message) {
   bool handled = false;
-  
+
   // Check for callbacks first
   if (message->GetName() == "executeCommandCallback") {
     int32 commandId = message->GetArgumentList()->GetInt(0);
     bool result = message->GetArgumentList()->GetBool(1);
-    
+
     CefRefPtr<CommandCallback> callback = command_callback_map_[commandId];
     callback->CommandComplete(result);
     command_callback_map_.erase(commandId);
-    
+
     handled = true;
   }
-  
+
   // Execute delegate callbacks.
   ProcessMessageDelegateSet::iterator it = process_message_delegates_.begin();
   for (; it != process_message_delegates_.end() && !handled; ++it) {
     handled = (*it)->OnProcessMessageReceived(this, browser, source_process,
                                               message);
   }
-    
+
   return handled;
 }
 
@@ -159,7 +159,7 @@ void ClientHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
     PopupCreated(browser);
   }
 
-  browser_window_map_[browser->GetHost()->GetWindowHandle()] = browser;
+  browser_window_map_[(ClientWindowHandle)browser->GetHost()->GetWindowHandle()] = browser;
 }
 
 void ClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
@@ -171,9 +171,9 @@ void ClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
       m_Browser = NULL;
 	}
 
-    browser_window_map_.erase(browser->GetHost()->GetWindowHandle());
+    browser_window_map_.erase((ClientWindowHandle)browser->GetHost()->GetWindowHandle());
   }
-  
+
   if (m_quitting) {
     // Changed the logic to call CefQuitMesaageLoop()
     // for windows as it was crashing with 2171 CEF.
@@ -190,7 +190,7 @@ bool ClientHandler::OnDragEnter(CefRefPtr<CefBrowser> browser,
                                 CefRefPtr<CefDragData> dragData,
                                 DragOperationsMask mask) {
     REQUIRE_UI_THREAD();
-    
+
     if (dragData->IsFile()) {
         gDroppedFiles.clear();
         // Store the dragged files in a vector for later use
@@ -229,7 +229,7 @@ void ClientHandler::OnLoadError(CefRefPtr<CefBrowser> browser,
 
   // Display a load error message.
   std::stringstream ss;
-  
+
   ss << "<html>" <<
         "<head>" <<
         "  <style type='text/css'>" <<
@@ -279,7 +279,7 @@ bool ClientHandler::OnConsoleMessage(CefRefPtr<CefBrowser> browser,
   // Don't write the message to a console.log file. Instead, we'll just
   // return false here so the message gets written to the console (output window
   // in xcode, or console window in dev tools)
-  
+
 /*
   REQUIRE_UI_THREAD();
 
@@ -361,20 +361,20 @@ bool ClientHandler::OnContextMenuCommand(
   }
 }
 
-void ClientHandler::SetMainHwnd(CefWindowHandle hwnd) {
+void ClientHandler::SetMainHwnd(ClientWindowHandle hwnd) {
   AutoLock lock_scope(this);
   m_MainHwnd = hwnd;
 }
 
-void ClientHandler::SetEditHwnd(CefWindowHandle hwnd) {
+void ClientHandler::SetEditHwnd(ClientWindowHandle hwnd) {
   AutoLock lock_scope(this);
   m_EditHwnd = hwnd;
 }
 
-void ClientHandler::SetButtonHwnds(CefWindowHandle backHwnd,
-                                   CefWindowHandle forwardHwnd,
-                                   CefWindowHandle reloadHwnd,
-                                   CefWindowHandle stopHwnd) {
+void ClientHandler::SetButtonHwnds(ClientWindowHandle backHwnd,
+                                   ClientWindowHandle forwardHwnd,
+                                   ClientWindowHandle reloadHwnd,
+                                   ClientWindowHandle stopHwnd) {
   AutoLock lock_scope(this);
   m_BackHwnd = backHwnd;
   m_ForwardHwnd = forwardHwnd;
@@ -455,7 +455,7 @@ void ClientHandler::DispatchCloseToNextBrowser()
 
       // Bring the window to the front before sending the command
       BringBrowserWindowToFront(browser);
-    
+
       // This call initiates a quit sequence. We will continue to close browser windows
       // unless AbortQuit() is called.
       m_quitting = true;
diff --git a/appshell/client_handler.h b/appshell/client_handler.h
index 225c02cb8..696018470 100644
--- a/appshell/client_handler.h
+++ b/appshell/client_handler.h
@@ -16,7 +16,13 @@
 
 #include <algorithm> 
 
-
+#if defined(OS_LINUX)
+// The Linux client uses GTK instead of the underlying platform type (X11).
+#include <gtk/gtk.h>
+#define ClientWindowHandle GtkWidget*
+#else
+#define ClientWindowHandle CefWindowHandle
+#endif
 
 // Define this value to redirect all popup URLs to the main application browser
 // window.
@@ -184,13 +190,13 @@ class ClientHandler : public CefClient,
                                     const CefKeyEvent& event,
                                     CefEventHandle os_event) OVERRIDE;
 
-  void SetMainHwnd(CefWindowHandle hwnd);
-  CefWindowHandle GetMainHwnd() { return m_MainHwnd; }
-  void SetEditHwnd(CefWindowHandle hwnd);
-  void SetButtonHwnds(CefWindowHandle backHwnd,
-                      CefWindowHandle forwardHwnd,
-                      CefWindowHandle reloadHwnd,
-                      CefWindowHandle stopHwnd);
+  void SetMainHwnd(ClientWindowHandle hwnd);
+  ClientWindowHandle GetMainHwnd() { return m_MainHwnd; }
+  void SetEditHwnd(ClientWindowHandle hwnd);
+  void SetButtonHwnds(ClientWindowHandle backHwnd,
+                      ClientWindowHandle forwardHwnd,
+                      ClientWindowHandle reloadHwnd,
+                      ClientWindowHandle stopHwnd);
 
   CefRefPtr<CefBrowser> GetBrowser() { return m_Browser; }
   int GetBrowserId() { return m_BrowserId; }
@@ -240,7 +246,7 @@ class ClientHandler : public CefClient,
   static void CreateRequestDelegates(RequestDelegateSet& delegates);
 
   // The main frame window handle
-  CefWindowHandle m_MainHwnd;
+  ClientWindowHandle m_MainHwnd;
 
   // The child browser window. This is only set for the FIRST client window.
   // The browser id for m_Browser is stored in m_BrowserId.
@@ -257,13 +263,13 @@ class ClientHandler : public CefClient,
   int m_BrowserId;
 
   // The edit window handle
-  CefWindowHandle m_EditHwnd;
+  ClientWindowHandle m_EditHwnd;
 
   // The button window handles
-  CefWindowHandle m_BackHwnd;
-  CefWindowHandle m_ForwardHwnd;
-  CefWindowHandle m_StopHwnd;
-  CefWindowHandle m_ReloadHwnd;
+  ClientWindowHandle m_BackHwnd;
+  ClientWindowHandle m_ForwardHwnd;
+  ClientWindowHandle m_StopHwnd;
+  ClientWindowHandle m_ReloadHwnd;
                           
   // Support for logging.
   std::string m_LogFile;
@@ -279,7 +285,7 @@ class ClientHandler : public CefClient,
   ProcessMessageDelegateSet process_message_delegates_;
   RequestDelegateSet request_delegates_;
 
-  typedef std::map< CefWindowHandle, CefRefPtr<CefBrowser> > BrowserWindowMap;
+  typedef std::map< ClientWindowHandle, CefRefPtr<CefBrowser> > BrowserWindowMap;
   static BrowserWindowMap browser_window_map_;
                         
   typedef std::map<int32, CefRefPtr<CommandCallback> > CommandCallbackMap;

From 494b058882291c1d9c3ece584d59298fba09937e Mon Sep 17 00:00:00 2001
From: Jason San Jose <jasonsj@adobe.com>
Date: Fri, 5 Dec 2014 11:08:34 -0800
Subject: [PATCH 02/15] fix missing gtk dependencies

---
 .gitignore                       |  1 +
 appshell.gyp                     | 40 +++++++++++++++++++++++++++-----
 appshell/client_app_gtk.cpp      | 35 ++++++++++++++--------------
 appshell/resource_util_linux.cpp |  1 +
 4 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7525d3768..63c8769fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ appshell_extensions_js.o
 Makefile
 appshell.Makefile
 Brackets.target.mk
+gtk.target.mk
 libcef_dll_wrapper.target.mk
 appshell/gtk
 appshell/gtk/*
diff --git a/appshell.gyp b/appshell.gyp
index 44d4ff9ec..7e54ae27a 100755
--- a/appshell.gyp
+++ b/appshell.gyp
@@ -333,16 +333,18 @@
             '<@(includes_linux)',
             '<@(appshell_sources_linux)',
           ],
+          'dependencies': [
+            'gtk'
+          ],
           'link_settings': {
             'ldflags': [
-              '<!@(<(pkg-config) --libs-only-other gtk+-2.0 gthread-2.0)',
-              '-Wl,-rpath,\$$ORIGIN/lib',
-              '<(march)'
+              # Look for libcef.so in the current directory. Path can also be
+              # specified using the LD_LIBRARY_PATH environment variable.
+              '-Wl,-rpath,.',
             ],
             'libraries': [
-              '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
-              '$(BUILDTYPE)/libcef.so',
-              'appshell_extensions_js.o',
+              "$(BUILDTYPE)/libcef.so",
+              "-lX11",
             ],
           },
         }],
@@ -490,6 +492,32 @@
         },  # target appshell_helper_app
       ],
     }],  # OS=="mac"
+    [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+      'targets': [
+        {
+          'target_name': 'gtk',
+          'type': 'none',
+          'variables': {
+            # gtk requires gmodule, but it does not list it as a dependency
+            # in some misconfigured systems.
+            'gtk_packages': 'gmodule-2.0 gtk+-2.0 gthread-2.0',
+          },
+          'direct_dependent_settings': {
+            'cflags': [
+              '$(shell <(pkg-config) --cflags <(gtk_packages))',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '$(shell <(pkg-config) --libs-only-L --libs-only-other <(gtk_packages))',
+            ],
+            'libraries': [
+              '$(shell <(pkg-config) --libs-only-l <(gtk_packages))',
+            ],
+          },
+        },
+      ],
+    }],  # OS=="linux" or OS=="freebsd" or OS=="openbsd"
     ['target_arch=="ia32"', {
       'variables': {
         'output_bfd': 'elf32-i386',
diff --git a/appshell/client_app_gtk.cpp b/appshell/client_app_gtk.cpp
index a4173b903..2225df449 100644
--- a/appshell/client_app_gtk.cpp
+++ b/appshell/client_app_gtk.cpp
@@ -1,31 +1,32 @@
 /*
  * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
- */ 
+ *
+ */
 
 #include "client_app.h"
 #include "resource.h"
 #include "include/cef_base.h"
 #include "config.h"
 
+#include <gtk/gtk.h>
 #include <pwd.h>
 #include <algorithm>
 //#include <MMSystem.h>
@@ -79,16 +80,16 @@ double ClientApp::GetElapsedMilliseconds()
     return (time(NULL) - g_appStartupTime);
 }
 
-CefString ClientApp::AppGetSupportDirectory() 
+CefString ClientApp::AppGetSupportDirectory()
 {
     gchar *supportDir = g_strdup_printf("%s/%s", g_get_user_config_dir(), APP_NAME);
     CefString result = CefString(supportDir);
     g_free(supportDir);
-    
+
     return result;
 }
 
-CefString ClientApp::AppGetDocumentsDirectory() 
+CefString ClientApp::AppGetDocumentsDirectory()
 {
     const char *dir = g_get_user_special_dir(G_USER_DIRECTORY_DOCUMENTS);
     if (dir == NULL)  {
@@ -96,4 +97,4 @@ CefString ClientApp::AppGetDocumentsDirectory()
     } else {
         return CefString(dir);
     }
-}
\ No newline at end of file
+}
diff --git a/appshell/resource_util_linux.cpp b/appshell/resource_util_linux.cpp
index 2d55e62b3..474cd3967 100644
--- a/appshell/resource_util_linux.cpp
+++ b/appshell/resource_util_linux.cpp
@@ -6,6 +6,7 @@
 #include "resource_util.h"
 #include <stdio.h>
 #include <string>
+#include <unistd.h>
 #include "include/cef_stream.h"
 #include "util.h"
 

From de1d4ebdc316b4f5d319ef1116c630d16c445d5f Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Fri, 5 Dec 2014 16:16:07 -0800
Subject: [PATCH 03/15] - added missing resources to be copied to build
 directory

---
 appshell_paths.gypi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appshell_paths.gypi b/appshell_paths.gypi
index 90e60ac42..b61b8a1dc 100755
--- a/appshell_paths.gypi
+++ b/appshell_paths.gypi
@@ -329,6 +329,9 @@
       'appshell/res/appshell48.png',
       'appshell/res/appshell128.png',
       'appshell/res/appshell256.png',
+      'Resources/icudtl.dat',
+      'Resources/cef_100_percent.pak',
+      'Resources/cef_200_percent.pak',
       'Resources/cef.pak',
       'Resources/devtools_resources.pak',
     ],

From 99026c1e331d9df8a66d6275f55e060e4a74c142 Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Mon, 8 Dec 2014 00:23:35 -0800
Subject: [PATCH 04/15] - resolved the set window title crash by using the X11
 window

---
 appshell/cefclient_gtk.cpp      | 39 +++++++++++++++++++++++--------
 appshell/client_handler_gtk.cpp | 41 +++++++++++++++++++++++++++++----
 2 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/appshell/cefclient_gtk.cpp b/appshell/cefclient_gtk.cpp
index 2aa6aa54c..f7a7fb91a 100644
--- a/appshell/cefclient_gtk.cpp
+++ b/appshell/cefclient_gtk.cpp
@@ -140,6 +140,24 @@ gboolean GetSourceActivated(GtkWidget* widget) {
   return FALSE;
 }
 
+gboolean WindowConfigure(GtkWindow* window, 
+                         GdkEvent* event,
+                         gpointer data) {
+  // Called when size, position or stack order changes.
+  if (g_handler) {
+    CefRefPtr<CefBrowser> browser = g_handler->GetBrowser();
+    if (browser) {
+      // Notify the browser of move/resize events so that:
+      // - Popup windows are displayed in the correct location and dismissed
+      //   when the window moves.
+      // - Drag&drop areas are updated accordingly.
+      browser->GetHost()->NotifyMoveOrResizeStarted();
+    }
+  }
+
+  return FALSE;  // Don't stop this message.
+}
+
 int main(int argc, char* argv[]) {
   CefMainArgs main_args(argc, argv);
 
@@ -157,8 +175,6 @@ int main(int argc, char* argv[]) {
   if (!getcwd(szWorkingDir, sizeof (szWorkingDir)))
     return -1;
 
-  GtkWidget* window;
-
   // Parse command line arguments.
   AppInitCommandLine(argc, argv);
 
@@ -209,7 +225,7 @@ int main(int argc, char* argv[]) {
     list = g_list_append(list, icon);
   }
 
-  window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
 
   gtk_window_set_icon_list(GTK_WINDOW(window), list);
@@ -227,6 +243,9 @@ int main(int argc, char* argv[]) {
 
   gtk_box_pack_start(GTK_BOX(vbox), menuBar, FALSE, FALSE, 0);
 
+  g_signal_connect(G_OBJECT(window), "configure-event",
+                   G_CALLBACK(WindowConfigure), NULL);
+
   g_signal_connect(G_OBJECT(window), "delete_event",
                    G_CALLBACK(HandleQuit), NULL);
   g_signal_connect(G_OBJECT(window), "destroy",
@@ -246,16 +265,16 @@ int main(int argc, char* argv[]) {
 
   browserSettings.web_security = STATE_DISABLED;
 
-  window_info.SetAsChild(GDK_WINDOW_XID(gtk_widget_get_window(vbox)), CefRect(0, 0, 800, 600));
-
-  CefBrowserHost::CreateBrowser(
-      window_info,
-      static_cast<CefRefPtr<CefClient> >(g_handler),
-      "file://"+szInitialUrl, browserSettings, NULL);
-
   gtk_container_add(GTK_CONTAINER(window), vbox);
   gtk_widget_show_all(GTK_WIDGET(window));
 
+  window_info.SetAsChild(GDK_WINDOW_XID(gtk_widget_get_window(window)), CefRect(0, 0, 800, 600));
+
+  CefBrowserHost::CreateBrowser(
+    window_info,
+    g_handler.get(),
+    "file://" + szInitialUrl, browserSettings, NULL);
+
   // Install an signal handler so we clean up after ourselves.
   signal(SIGINT, TerminationSignalHandler);
   signal(SIGTERM, TerminationSignalHandler);
diff --git a/appshell/client_handler_gtk.cpp b/appshell/client_handler_gtk.cpp
index dcde66a91..cfb0829bf 100644
--- a/appshell/client_handler_gtk.cpp
+++ b/appshell/client_handler_gtk.cpp
@@ -29,12 +29,43 @@ void ClientHandler::OnAddressChange(CefRefPtr<CefBrowser> browser,
 void ClientHandler::OnTitleChange(CefRefPtr<CefBrowser> browser,
                                   const CefString& title) {
   REQUIRE_UI_THREAD();
-
-  GtkWidget* window = gtk_widget_get_ancestor(
-      GTK_WIDGET(browser->GetHost()->GetWindowHandle()),
-      GTK_TYPE_WINDOW);
   std::string titleStr(title);
-  gtk_window_set_title(GTK_WINDOW(window), titleStr.c_str());
+
+  // Retrieve the X11 display shared with Chromium.
+  ::Display* display = cef_get_xdisplay();
+  DCHECK(display);
+
+  // Retrieve the X11 window handle for the browser.
+  ::Window window = browser->GetHost()->GetWindowHandle();
+  DCHECK(window != kNullWindowHandle);
+
+  // Retrieve the atoms required by the below XChangeProperty call.
+  const char* kAtoms[] = {
+    "_NET_WM_NAME",
+    "UTF8_STRING"
+  };
+  Atom atoms[2];
+  int result = XInternAtoms(display, const_cast<char**>(kAtoms), 2, false,
+                            atoms);
+  if (!result)
+    NOTREACHED();
+
+  // Set the window title.
+  XChangeProperty(display,
+                  window,
+                  atoms[0],
+                  atoms[1],
+                  8,
+                  PropModeReplace,
+                  reinterpret_cast<const unsigned char*>(titleStr.c_str()),
+                  titleStr.size());
+
+  // TODO(erg): This is technically wrong. So XStoreName and friends expect
+  // this in Host Portable Character Encoding instead of UTF-8, which I believe
+  // is Compound Text. This shouldn't matter 90% of the time since this is the
+  // fallback to the UTF8 property above.
+  XStoreName(display, browser->GetHost()->GetWindowHandle(), titleStr.c_str());
+
 }
 
 void ClientHandler::SendNotification(NotificationType type) {

From 425e9876407490c76824a005c18b9960081bcdfb Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Mon, 8 Dec 2014 18:27:43 -0800
Subject: [PATCH 05/15] - fixed the resize and focus issue. Brackets is no
 longer crashing at quit. It's not properly shutting down right now :-(

---
 appshell/appshell_extensions_gtk.cpp |   5 +-
 appshell/cefclient_gtk.cpp           | 183 +++++++++++++++++++--------
 2 files changed, 134 insertions(+), 54 deletions(-)

diff --git a/appshell/appshell_extensions_gtk.cpp b/appshell/appshell_extensions_gtk.cpp
index e4e456df8..68374f208 100644
--- a/appshell/appshell_extensions_gtk.cpp
+++ b/appshell/appshell_extensions_gtk.cpp
@@ -40,6 +40,9 @@
 
 GtkWidget* _menuWidget;
 
+// The global ClientHandler reference.
+extern CefRefPtr<ClientHandler> g_handler;
+
 // Supported browsers (order matters):
 //   - google-chorme 
 //   - chromium-browser - chromium executable name (in ubuntu)
@@ -546,7 +549,7 @@ void CloseWindow(CefRefPtr<CefBrowser> browser)
 void BringBrowserWindowToFront(CefRefPtr<CefBrowser> browser)
 {
     if (browser.get()) {
-        GtkWindow* hwnd = GTK_WINDOW(browser->GetHost()->GetWindowHandle());
+        GtkWindow* hwnd = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
         if (hwnd) 
             gtk_window_present(hwnd);
     }
diff --git a/appshell/cefclient_gtk.cpp b/appshell/cefclient_gtk.cpp
index f7a7fb91a..8120a82e7 100644
--- a/appshell/cefclient_gtk.cpp
+++ b/appshell/cefclient_gtk.cpp
@@ -20,19 +20,39 @@
 #include "client_switches.h"
 #include "appshell_node_process.h"
 
-static std::string APPICONS[] = {"appshell32.png","appshell48.png","appshell128.png","appshell256.png"};
-char szWorkingDir[512];  // The current working directory
+static std::string APPICONS[] = {"appshell32.png", "appshell48.png", "appshell128.png", "appshell256.png"};
+char szWorkingDir[512]; // The current working directory
 std::string szInitialUrl;
 std::string szRunningDir;
 int add_handler_id;
 bool isReallyClosing = false;
 
+static gint DEFAULT_SIZE_HEIGHT = 600;
+static gint DEFAULT_SIZE_WIDTH = 800;
+
 // The global ClientHandler reference.
 extern CefRefPtr<ClientHandler> g_handler;
 
 // Application startup time
 time_t g_appStartupTime;
 
+// Error handler for X11
+
+int XErrorHandlerImpl(Display *display, XErrorEvent *event) {
+  LOG(WARNING)
+          << "X error received: "
+          << "type " << event->type << ", "
+          << "serial " << event->serial << ", "
+          << "error_code " << static_cast<int> (event->error_code) << ", "
+          << "request_code " << static_cast<int> (event->request_code) << ", "
+          << "minor_code " << static_cast<int> (event->minor_code);
+  return 0;
+}
+
+int XIOErrorHandlerImpl(Display *display) {
+  return 0;
+}
+
 void destroy(void) {
   CefQuitMessageLoop();
 }
@@ -40,25 +60,31 @@ void destroy(void) {
 void TerminationSignalHandler(int signatl) {
   destroy();
 }
+
 void HandleAdd(GtkContainer *container,
-               GtkWidget *widget,
-               gpointer user_data) {
+        GtkWidget *widget,
+        gpointer user_data) {
   g_signal_handler_disconnect(container, add_handler_id);
-  if(gtk_widget_get_can_focus(widget)) {
+  if (gtk_widget_get_can_focus(widget)) {
     gtk_widget_grab_focus(widget);
-  }
-  else {
+  } else {
     add_handler_id = g_signal_connect(G_OBJECT(widget), "add",
-                                      G_CALLBACK(HandleAdd), NULL);
+            G_CALLBACK(HandleAdd), NULL);
   }
 }
 
-static gboolean HandleQuit(int signatl) {
+gboolean HandleQuit(GtkWidget* widget, GdkEvent* event, GtkWindow* window) {
   if (!isReallyClosing && g_handler.get() && g_handler->GetBrowserId()) {
-    CefRefPtr<CommandCallback> callback = new CloseWindowCommandCallback(g_handler->GetBrowser());
+    CefRefPtr<CefBrowser> browser = g_handler->GetBrowser();
+
+    if (browser.get()) {
+      CefRefPtr<CommandCallback> callback = new CloseWindowCommandCallback(browser);
 
-    g_handler->SendJSCommand(g_handler->GetBrowser(), FILE_CLOSE_WINDOW, callback);
-    return TRUE;
+      g_handler->SendJSCommand(browser, FILE_CLOSE_WINDOW, callback);
+
+      browser->GetHost()->CloseBrowser(false);
+      return TRUE;
+    }
   }
   destroy();
 }
@@ -70,22 +96,21 @@ bool FileExists(std::string path) {
 
 int GetInitialUrl() {
   GtkWidget *dialog;
-     const char* dialog_title = "Please select the index.html file";
-     GtkFileChooserAction file_or_directory = GTK_FILE_CHOOSER_ACTION_OPEN ;
-     dialog = gtk_file_chooser_dialog_new (dialog_title,
-                          NULL,
-                          file_or_directory,
-                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                          GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                          NULL);
-
-    if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-      {
-        szInitialUrl = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-        gtk_widget_destroy (dialog);
-        return 0;
-      }
-    return -1;
+  const char* dialog_title = "Please select the index.html file";
+  GtkFileChooserAction file_or_directory = GTK_FILE_CHOOSER_ACTION_OPEN;
+  dialog = gtk_file_chooser_dialog_new(dialog_title,
+          NULL,
+          file_or_directory,
+          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+          GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+          NULL);
+
+  if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+    szInitialUrl = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+    gtk_widget_destroy(dialog);
+    return 0;
+  }
+  return -1;
 }
 
 // Global functions
@@ -95,17 +120,17 @@ std::string AppGetWorkingDirectory() {
 }
 
 std::string AppGetRunningDirectory() {
-  if(szRunningDir.length() > 0)
+  if (szRunningDir.length() > 0)
     return szRunningDir;
 
   char buf[512];
   int len = readlink("/proc/self/exe", buf, 512);
 
-  if(len < 0)
-    return AppGetWorkingDirectory();  //# Well, can't think of any real-world case where this would be happen
+  if (len < 0)
+    return AppGetWorkingDirectory(); //# Well, can't think of any real-world case where this would be happen
 
-  for(; len >= 0; len--){
-    if(buf[len] == '/'){
+  for (; len >= 0; len--) {
+    if (buf[len] == '/') {
       buf[len] = '\0';
       szRunningDir.append(buf);
       return szRunningDir;
@@ -120,7 +145,7 @@ CefString AppGetCachePath() {
 }
 
 GtkWidget* AddMenuEntry(GtkWidget* menu_widget, const char* text,
-                        GCallback callback) {
+        GCallback callback) {
   GtkWidget* entry = gtk_menu_item_new_with_label(text);
   g_signal_connect(entry, "activate", callback, NULL);
   gtk_menu_shell_append(GTK_MENU_SHELL(menu_widget), entry);
@@ -136,13 +161,14 @@ GtkWidget* CreateMenu(GtkWidget* menu_bar, const char* text) {
 }
 
 // Callback for Debug > Get Source... menu item.
+
 gboolean GetSourceActivated(GtkWidget* widget) {
   return FALSE;
 }
 
-gboolean WindowConfigure(GtkWindow* window, 
-                         GdkEvent* event,
-                         gpointer data) {
+gboolean WindowConfigure(GtkWindow* window,
+        GdkEvent* event,
+        gpointer data) {
   // Called when size, position or stack order changes.
   if (g_handler) {
     CefRefPtr<CefBrowser> browser = g_handler->GetBrowser();
@@ -155,7 +181,48 @@ gboolean WindowConfigure(GtkWindow* window,
     }
   }
 
-  return FALSE;  // Don't stop this message.
+  return FALSE; // Don't stop this message.
+}
+
+void VboxSizeAllocated(GtkWidget* widget,
+        GtkAllocation* allocation,
+        void* data) {
+  if (g_handler) {
+    CefRefPtr<CefBrowser> browser = g_handler->GetBrowser();
+    if (browser && !browser->GetHost()->IsWindowRenderingDisabled()) {
+      // Size the browser window to match the GTK widget.
+      ::Display* xdisplay = cef_get_xdisplay();
+      ::Window xwindow = browser->GetHost()->GetWindowHandle();
+      XWindowChanges changes = {0};
+
+      // TODO: get the real value
+      int g_menubar_height = 0;
+      changes.width = allocation->width;
+      changes.height = allocation->height - (g_menubar_height);
+      changes.y = g_menubar_height;
+      XConfigureWindow(xdisplay, xwindow, CWHeight | CWWidth | CWY, &changes);
+    }
+  }
+}
+
+gboolean WindowFocusIn(GtkWidget* widget,
+        GdkEventFocus* event,
+        gpointer user_data) {
+  if (g_handler && event->in) {
+    CefRefPtr<CefBrowser> browser = g_handler->GetBrowser();
+    if (browser) {
+      if (browser->GetHost()->IsWindowRenderingDisabled()) {
+        // Give focus to the off-screen browser.
+        browser->GetHost()->SendFocusEvent(true);
+      } else {
+        // Give focus to the browser window.
+        browser->GetHost()->SetFocus(true);
+        return TRUE;
+      }
+    }
+  }
+
+  return FALSE;
 }
 
 int main(int argc, char* argv[]) {
@@ -178,6 +245,11 @@ int main(int argc, char* argv[]) {
   // Parse command line arguments.
   AppInitCommandLine(argc, argv);
 
+  // Install xlib error handlers so that the application won't be terminated
+  // on non-fatal errors.
+  XSetErrorHandler(XErrorHandlerImpl);
+  XSetIOErrorHandler(XIOErrorHandlerImpl);
+
   CefSettings settings;
 
   // Populate the settings based on command line arguments.
@@ -213,20 +285,20 @@ int main(int argc, char* argv[]) {
   CefInitialize(main_args, settings, app.get(), NULL);
 
   // Set window icon
-  std::vector<std::string> icons(APPICONS, APPICONS + sizeof(APPICONS) / sizeof(APPICONS[0]) );
+  std::vector<std::string> icons(APPICONS, APPICONS + sizeof (APPICONS) / sizeof (APPICONS[0]));
   GList *list = NULL;
   for (int i = 0; i < icons.size(); ++i) {
     std::string path = icons[i];
 
     GdkPixbuf *icon = gdk_pixbuf_new_from_file(path.c_str(), NULL);
     if (!icon)
-       continue;
+      continue;
 
     list = g_list_append(list, icon);
   }
 
   GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
+  gtk_window_set_default_size(GTK_WINDOW(window), DEFAULT_SIZE_WIDTH, DEFAULT_SIZE_HEIGHT);
 
   gtk_window_set_icon_list(GTK_WINDOW(window), list);
 
@@ -235,6 +307,9 @@ int main(int argc, char* argv[]) {
   g_list_free(list);
 
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
+  g_signal_connect(vbox, "size-allocate",
+          G_CALLBACK(VboxSizeAllocated), NULL);
+  gtk_container_add(GTK_CONTAINER(window), vbox);
 
   GtkWidget* menuBar = gtk_menu_bar_new();
   // GtkWidget* debug_menu = CreateMenu(menuBar, "Tests");
@@ -243,17 +318,17 @@ int main(int argc, char* argv[]) {
 
   gtk_box_pack_start(GTK_BOX(vbox), menuBar, FALSE, FALSE, 0);
 
+  // setup all event listener to handle focus, resizing, destruction
   g_signal_connect(G_OBJECT(window), "configure-event",
-                   G_CALLBACK(WindowConfigure), NULL);
-
+          G_CALLBACK(WindowConfigure), NULL);
+  g_signal_connect(G_OBJECT(window), "focus-in-event",
+          G_CALLBACK(WindowFocusIn), NULL);
   g_signal_connect(G_OBJECT(window), "delete_event",
-                   G_CALLBACK(HandleQuit), NULL);
+          G_CALLBACK(HandleQuit), NULL);
   g_signal_connect(G_OBJECT(window), "destroy",
-                   G_CALLBACK(gtk_widget_destroyed), &window);
+          G_CALLBACK(gtk_widget_destroyed), &window);
   add_handler_id = g_signal_connect(G_OBJECT(window), "add",
-                                      G_CALLBACK(HandleAdd), NULL);
-  // g_signal_connect(G_OBJECT(window), "destroy",
-  //                  G_CALLBACK(destroy), NULL);
+          G_CALLBACK(HandleAdd), NULL);
 
   // Create the handler.
   g_handler = new ClientHandler();
@@ -265,15 +340,17 @@ int main(int argc, char* argv[]) {
 
   browserSettings.web_security = STATE_DISABLED;
 
-  gtk_container_add(GTK_CONTAINER(window), vbox);
+  // show the window
   gtk_widget_show_all(GTK_WIDGET(window));
 
-  window_info.SetAsChild(GDK_WINDOW_XID(gtk_widget_get_window(window)), CefRect(0, 0, 800, 600));
+  window_info.SetAsChild(GDK_WINDOW_XID(gtk_widget_get_window(window)),
+          CefRect(0, 0, DEFAULT_SIZE_WIDTH, DEFAULT_SIZE_HEIGHT));
 
+  // Create the browser window
   CefBrowserHost::CreateBrowser(
-    window_info,
-    g_handler.get(),
-    "file://" + szInitialUrl, browserSettings, NULL);
+          window_info,
+          g_handler.get(),
+          "file://" + szInitialUrl, browserSettings, NULL);
 
   // Install an signal handler so we clean up after ourselves.
   signal(SIGINT, TerminationSignalHandler);

From 84d1de6d73611b6810e586704ccb585e689f0cb6 Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Wed, 10 Dec 2014 15:25:12 -0800
Subject: [PATCH 06/15] - update the Linux experiment with CEF

Conflicts:
	appshell/client_handler.cpp
---
 appshell/appshell_extensions_gtk.cpp | 24 +++++---
 appshell/cefclient_gtk.cpp           | 83 +++++++++++++++++++---------
 appshell/client_handler.cpp          |  3 +-
 appshell/client_handler.h            |  3 +-
 appshell/client_handler_gtk.cpp      | 29 ++++++++--
 5 files changed, 101 insertions(+), 41 deletions(-)

diff --git a/appshell/appshell_extensions_gtk.cpp b/appshell/appshell_extensions_gtk.cpp
index 68374f208..2b4d84c16 100644
--- a/appshell/appshell_extensions_gtk.cpp
+++ b/appshell/appshell_extensions_gtk.cpp
@@ -535,15 +535,21 @@ void MoveFileOrDirectoryToTrash(ExtensionString filename, CefRefPtr<CefBrowser>
 
 void CloseWindow(CefRefPtr<CefBrowser> browser)
 {
-    if (browser.get()) {
-        isReallyClosing = true;
-        // //# Hack because CEF's CloseBrowser() is bad. Should emit delete_event instead of directly destroying widget
-        // GtkWidget* hwnd = gtk_widget_get_toplevel (browser->GetHost()->GetWindowHandle() );
-        // if(gtk_widget_is_toplevel (hwnd))
-        //     gtk_signal_emit_by_name(GTK_OBJECT(hwnd), "delete_event");
-        // else
-            browser->GetHost()->CloseBrowser(true);
-    }
+  g_message("CloseWindow called");
+  if (browser.get()) {
+    isReallyClosing = true;
+    g_message("CloseWindow::isReallyClosing = true");
+    browser->GetHost()->CloseBrowser(false);
+
+    // //# Hack because CEF's CloseBrowser() is bad. Should emit delete_event instead of directly destroying widget
+    //GtkWidget* hwnd = gtk_widget_get_toplevel (browser->GetHost()->GetWindowHandle() );
+    //GtkWindow* hwnd = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
+//        if(gtk_widget_is_toplevel (hwnd))
+    //g_message("Called destroy");
+    //gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
+    //gtk_signal_emit_by_name(GTK_OBJECT(hwnd), "delete_event");
+    // else
+  }
 }
 
 void BringBrowserWindowToFront(CefRefPtr<CefBrowser> browser)
diff --git a/appshell/cefclient_gtk.cpp b/appshell/cefclient_gtk.cpp
index 8120a82e7..ca88b3123 100644
--- a/appshell/cefclient_gtk.cpp
+++ b/appshell/cefclient_gtk.cpp
@@ -54,39 +54,67 @@ int XIOErrorHandlerImpl(Display *display) {
 }
 
 void destroy(void) {
-  CefQuitMessageLoop();
+  g_message("destroy called");
+
+  if (isReallyClosing) {
+    CefQuitMessageLoop();
+  }
 }
 
-void TerminationSignalHandler(int signatl) {
+void TerminationSignalHandler(int signal) {
+  isReallyClosing = true;
   destroy();
 }
 
-void HandleAdd(GtkContainer *container,
-        GtkWidget *widget,
-        gpointer user_data) {
-  g_signal_handler_disconnect(container, add_handler_id);
-  if (gtk_widget_get_can_focus(widget)) {
-    gtk_widget_grab_focus(widget);
-  } else {
-    add_handler_id = g_signal_connect(G_OBJECT(widget), "add",
-            G_CALLBACK(HandleAdd), NULL);
+//void HandleAdd(GtkContainer *container,
+//        GtkWidget *widget,
+//        gpointer user_data) {
+//  g_signal_handler_disconnect(container, add_handler_id);
+//  if (gtk_widget_get_can_focus(widget)) {
+//    gtk_widget_grab_focus(widget);
+//  } else {
+//    add_handler_id = g_signal_connect(G_OBJECT(widget), "add",
+//            G_CALLBACK(HandleAdd), NULL);
+//  }
+//}
+
+gboolean HandleQuit2(GtkWidget* widget, GdkEvent* event, GtkWindow* window) {
+  g_message("HandleQuit called");
+
+  if (g_handler.get()) {
+    g_handler->QuittingApp(true);
+    g_handler->DispatchCloseToNextBrowser();
+  }
+  else 
+  {
+    destroy();
   }
+  
+  return TRUE;
 }
 
-gboolean HandleQuit(GtkWidget* widget, GdkEvent* event, GtkWindow* window) {
-  if (!isReallyClosing && g_handler.get() && g_handler->GetBrowserId()) {
+// TODO: this is not yet called to shutdown Brackets
+gboolean HandleQuit() {
+  g_message("HandleQuit called");
+  
+  g_message("isReallyClosing %s", (isReallyClosing ? "True" : "False"));
+  if (!isReallyClosing && g_handler.get()) {
     CefRefPtr<CefBrowser> browser = g_handler->GetBrowser();
-
-    if (browser.get()) {
-      CefRefPtr<CommandCallback> callback = new CloseWindowCommandCallback(browser);
-
-      g_handler->SendJSCommand(browser, FILE_CLOSE_WINDOW, callback);
-
-      browser->GetHost()->CloseBrowser(false);
-      return TRUE;
-    }
+  
+    //CefRefPtr<CommandCallback> callback = new CloseWindowCommandCallback(browser);
+
+    //g_handler->SendJSCommand(browser, FILE_CLOSE_WINDOW, callback);
+    g_message("Close the browser");
+    
+    browser->GetHost()->CloseBrowser(false);
+    // Cancel the close
+    return TRUE;
   }
-  destroy();
+
+  if (isReallyClosing) 
+    destroy();
+  
+  return FALSE;
 }
 
 bool FileExists(std::string path) {
@@ -326,13 +354,15 @@ int main(int argc, char* argv[]) {
   g_signal_connect(G_OBJECT(window), "delete_event",
           G_CALLBACK(HandleQuit), NULL);
   g_signal_connect(G_OBJECT(window), "destroy",
-          G_CALLBACK(gtk_widget_destroyed), &window);
-  add_handler_id = g_signal_connect(G_OBJECT(window), "add",
-          G_CALLBACK(HandleAdd), NULL);
+          G_CALLBACK(destroy), window);
+  
+//  add_handler_id = g_signal_connect(G_OBJECT(window), "add",
+//          G_CALLBACK(HandleAdd), NULL);
 
   // Create the handler.
   g_handler = new ClientHandler();
   g_handler->SetMainHwnd(vbox);
+//  g_handler->SetMainHwnd(window);
 
   // Create the browser view.
   CefWindowInfo window_info;
@@ -361,6 +391,7 @@ int main(int argc, char* argv[]) {
 
   CefRunMessageLoop();
 
+  g_message("Shutdown CEF");
   CefShutdown();
 
   return 0;
diff --git a/appshell/client_handler.cpp b/appshell/client_handler.cpp
index 3f2199f24..ce90cff15 100644
--- a/appshell/client_handler.cpp
+++ b/appshell/client_handler.cpp
@@ -165,11 +165,12 @@ void ClientHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
 void ClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
   REQUIRE_UI_THREAD();
 
+  g_message("OnBeforeClose called");
   if (CanCloseBrowser(browser)) {
     if (m_BrowserId == browser->GetIdentifier()) {
       // Free the browser pointer so that the browser can be destroyed
       m_Browser = NULL;
-	}
+    }
 
     browser_window_map_.erase((ClientWindowHandle)browser->GetHost()->GetWindowHandle());
   }
diff --git a/appshell/client_handler.h b/appshell/client_handler.h
index 696018470..bb73e3fbd 100644
--- a/appshell/client_handler.h
+++ b/appshell/client_handler.h
@@ -231,7 +231,8 @@ class ClientHandler : public CefClient,
   void QuittingApp(bool quitting) { m_quitting = quitting; }
   bool AppIsQuitting() { return m_quitting; }
   bool HasWindows() const { return !browser_window_map_.empty(); }
-
+  virtual void AfterClose() OVERRIDE;
+  
  protected:
   void SetLoading(bool isLoading);
   void SetNavState(bool canGoBack, bool canGoForward);
diff --git a/appshell/client_handler_gtk.cpp b/appshell/client_handler_gtk.cpp
index cfb0829bf..24325f597 100644
--- a/appshell/client_handler_gtk.cpp
+++ b/appshell/client_handler_gtk.cpp
@@ -5,13 +5,18 @@
 #include <gtk/gtk.h>
 #include <X11/Xlib.h>
 #include <string>
+#include <gtk-2.0/gtk/gtksignal.h>
+#include <glib-2.0/gobject/gsignal.h>
 #include "client_handler.h"
 #include "include/cef_browser.h"
 #include "include/cef_frame.h"
+#include "include/cef_app.h"
 
 // The global ClientHandler reference.
 extern CefRefPtr<ClientHandler> g_handler;
 
+extern bool isReallyClosing;
+
 void ClientHandler::OnAddressChange(CefRefPtr<CefBrowser> browser,
                                     CefRefPtr<CefFrame> frame,
                                     const CefString& url) {
@@ -65,7 +70,6 @@ void ClientHandler::OnTitleChange(CefRefPtr<CefBrowser> browser,
   // is Compound Text. This shouldn't matter 90% of the time since this is the
   // fallback to the UTF8 property above.
   XStoreName(display, browser->GetHost()->GetWindowHandle(), titleStr.c_str());
-
 }
 
 void ClientHandler::SendNotification(NotificationType type) {
@@ -95,9 +99,26 @@ void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) {
 #endif // SHOW_TOOLBAR_UI
 }
 
-void ClientHandler::CloseMainWindow() {
-  // TODO(port): Check if this is enough
-  gtk_main_quit();
+bool ClientHandler::DoClose(CefRefPtr<CefBrowser> browser) {
+  g_message("DoClose called");
+  if (m_BrowserId == browser->GetIdentifier()) {
+    // Notify the parent window that it will be closed.
+//    browser->GetHost()->ParentWindowWillClose();
+    isReallyClosing = false;
+    g_message("isReallyClosing set to false");
+  }
+  
+//  isReallyClosing = true;
+  //GtkWindow* hwnd = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
+//  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
+
+  // A popup browser window is not contained in another window, so we can let
+  // these windows close by themselves.
+  return false;
+}
+
+void ClientHandler::AfterClose() {
+  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
 }
 
 void ClientHandler::ComputePopupPlacement(CefWindowInfo& windowInfo)

From 4bd1f4819d0311a283b84a1dd89d339400ba500f Mon Sep 17 00:00:00 2001
From: "Arzhan \"kai\" Kinzhalin" <arzhan.i.kinzhalin@intel.com>
Date: Tue, 6 Jan 2015 01:17:38 -0300
Subject: [PATCH 07/15] Add -lpthread to LIBS (libraries).

---
 appshell.gyp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appshell.gyp b/appshell.gyp
index 7e54ae27a..42e36008c 100755
--- a/appshell.gyp
+++ b/appshell.gyp
@@ -513,6 +513,7 @@
             ],
             'libraries': [
               '$(shell <(pkg-config) --libs-only-l <(gtk_packages))',
+              '-lpthread',
             ],
           },
         },

From f7812c326a3685b8c694b363249e9be07871e153 Mon Sep 17 00:00:00 2001
From: Jason San Jose <jasonsj@adobe.com>
Date: Thu, 22 Jan 2015 02:25:07 -0800
Subject: [PATCH 08/15] initialize char arrays before computing node path.
 remove DoClose for linux.

---
 appshell/appshell_node_process_linux.cpp | 10 +++++-----
 appshell/cefclient_gtk.cpp               |  6 +++---
 appshell/client_handler_gtk.cpp          | 18 ------------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/appshell/appshell_node_process_linux.cpp b/appshell/appshell_node_process_linux.cpp
index d4b4ce410..41729ec4b 100644
--- a/appshell/appshell_node_process_linux.cpp
+++ b/appshell/appshell_node_process_linux.cpp
@@ -40,7 +40,7 @@
 #include "config.h"
 
 #define BRACKETS_NODE_BUFFER_SIZE 4096
-#define MAX_PATH 128
+#define MAX_PATH 256
 
 // init mutex
 pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -82,10 +82,10 @@ void* nodeThread(void* unused) {
     
     // TODO nodeStartTime = get time();
     
-    char executablePath[MAX_PATH];
-    char bracketsDirPath[MAX_PATH];
-    char nodeExecutablePath[MAX_PATH];
-    char nodecorePath[MAX_PATH];
+    char executablePath[MAX_PATH] = {0};
+    char bracketsDirPath[MAX_PATH] = {0};
+    char nodeExecutablePath[MAX_PATH] = {0};
+    char nodecorePath[MAX_PATH] = {0};
 
     // get path to Brackets
     if (readlink("/proc/self/exe", executablePath, MAX_PATH) == -1) {
diff --git a/appshell/cefclient_gtk.cpp b/appshell/cefclient_gtk.cpp
index ca88b3123..bc5a3d9ef 100644
--- a/appshell/cefclient_gtk.cpp
+++ b/appshell/cefclient_gtk.cpp
@@ -309,6 +309,9 @@ int main(int argc, char* argv[]) {
     }
   }
 
+  // Start the node server process
+  startNodeProcess();
+
   // Initialize CEF.
   CefInitialize(main_args, settings, app.get(), NULL);
 
@@ -386,9 +389,6 @@ int main(int argc, char* argv[]) {
   signal(SIGINT, TerminationSignalHandler);
   signal(SIGTERM, TerminationSignalHandler);
 
-  // Start the node server process
-  startNodeProcess();
-
   CefRunMessageLoop();
 
   g_message("Shutdown CEF");
diff --git a/appshell/client_handler_gtk.cpp b/appshell/client_handler_gtk.cpp
index 24325f597..0f05269bf 100644
--- a/appshell/client_handler_gtk.cpp
+++ b/appshell/client_handler_gtk.cpp
@@ -99,24 +99,6 @@ void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) {
 #endif // SHOW_TOOLBAR_UI
 }
 
-bool ClientHandler::DoClose(CefRefPtr<CefBrowser> browser) {
-  g_message("DoClose called");
-  if (m_BrowserId == browser->GetIdentifier()) {
-    // Notify the parent window that it will be closed.
-//    browser->GetHost()->ParentWindowWillClose();
-    isReallyClosing = false;
-    g_message("isReallyClosing set to false");
-  }
-  
-//  isReallyClosing = true;
-  //GtkWindow* hwnd = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
-//  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
-
-  // A popup browser window is not contained in another window, so we can let
-  // these windows close by themselves.
-  return false;
-}
-
 void ClientHandler::AfterClose() {
   gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
 }

From 55e7b6fa1cf969d7a8ad260501ac763d99c7d208 Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Fri, 5 Dec 2014 11:53:06 -0800
Subject: [PATCH 09/15] - add appshell_extensions_js.o to libraries for linker

---
 appshell.gyp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appshell.gyp b/appshell.gyp
index 42e36008c..cb971936e 100755
--- a/appshell.gyp
+++ b/appshell.gyp
@@ -344,6 +344,7 @@
             ],
             'libraries': [
               "$(BUILDTYPE)/libcef.so",
+              "appshell_extensions_js.o",
               "-lX11",
             ],
           },

From 518a39056d3d9bff37658b589a300a875b204373 Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Fri, 5 Dec 2014 15:43:42 -0800
Subject: [PATCH 10/15] - fix the library load path for Brackets

---
 appshell.gyp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appshell.gyp b/appshell.gyp
index cb971936e..a539eef1a 100755
--- a/appshell.gyp
+++ b/appshell.gyp
@@ -340,7 +340,7 @@
             'ldflags': [
               # Look for libcef.so in the current directory. Path can also be
               # specified using the LD_LIBRARY_PATH environment variable.
-              '-Wl,-rpath,.',
+              '-Wl,-rpath,\$$ORIGIN/lib',
             ],
             'libraries': [
               "$(BUILDTYPE)/libcef.so",

From e99194a9ebc7afd4b71bee0dd37eb3e656eabef3 Mon Sep 17 00:00:00 2001
From: Jason San Jose <jasonsj@adobe.com>
Date: Thu, 22 Jan 2015 04:21:13 -0800
Subject: [PATCH 11/15] update installer build

---
 Gruntfile.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index ffacf60cf..45dabe3db 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -153,11 +153,14 @@ module.exports = function (grunt) {
                             "lib/**",
                             "locales/**",
                             "node-core/**",
+                            "cef.pak",
+                            "cef_100_percent.pak",
+                            "cef_200_percent.pak",
+                            "devtools_resources.pak",
+                            "icudtl.dat",
                             "appshell*.png",
                             "Brackets",
                             "Brackets-node",
-                            "cef.pak",
-                            "devtools_resources.pak"
                         ],
                         "dest"      : "<%= build.staging %>"
                     },

From ecb7b1f21a30bf08104598cd6e59fd54acbdc535 Mon Sep 17 00:00:00 2001
From: Prashanth Nethi <prashant@adobe.com>
Date: Fri, 30 Jan 2015 18:00:55 +0530
Subject: [PATCH 12/15] Fix for crash on quit on Linux

---
 appshell/appshell_extensions_gtk.cpp | 11 +++++---
 appshell/cefclient_gtk.cpp           | 40 ++++++----------------------
 appshell/client_handler.cpp          | 23 ++++++++--------
 3 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/appshell/appshell_extensions_gtk.cpp b/appshell/appshell_extensions_gtk.cpp
index 2b4d84c16..8c10fee77 100644
--- a/appshell/appshell_extensions_gtk.cpp
+++ b/appshell/appshell_extensions_gtk.cpp
@@ -535,11 +535,9 @@ void MoveFileOrDirectoryToTrash(ExtensionString filename, CefRefPtr<CefBrowser>
 
 void CloseWindow(CefRefPtr<CefBrowser> browser)
 {
-  g_message("CloseWindow called");
   if (browser.get()) {
     isReallyClosing = true;
-    g_message("CloseWindow::isReallyClosing = true");
-    browser->GetHost()->CloseBrowser(false);
+    browser->GetHost()->CloseBrowser(true);
 
     // //# Hack because CEF's CloseBrowser() is bad. Should emit delete_event instead of directly destroying widget
     //GtkWidget* hwnd = gtk_widget_get_toplevel (browser->GetHost()->GetWindowHandle() );
@@ -549,6 +547,13 @@ void CloseWindow(CefRefPtr<CefBrowser> browser)
     //gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
     //gtk_signal_emit_by_name(GTK_OBJECT(hwnd), "delete_event");
     // else
+    
+    // pass this message onto the window
+    if (g_handler && g_handler->GetMainHwnd()) {
+        GtkWidget* hwnd = gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd()));
+        if(gtk_widget_is_toplevel (hwnd))
+            gtk_signal_emit_by_name(GTK_OBJECT(hwnd), "delete_event");
+    }
   }
 }
 
diff --git a/appshell/cefclient_gtk.cpp b/appshell/cefclient_gtk.cpp
index bc5a3d9ef..e4733d9ee 100644
--- a/appshell/cefclient_gtk.cpp
+++ b/appshell/cefclient_gtk.cpp
@@ -54,8 +54,6 @@ int XIOErrorHandlerImpl(Display *display) {
 }
 
 void destroy(void) {
-  g_message("destroy called");
-
   if (isReallyClosing) {
     CefQuitMessageLoop();
   }
@@ -78,43 +76,22 @@ void TerminationSignalHandler(int signal) {
 //  }
 //}
 
-gboolean HandleQuit2(GtkWidget* widget, GdkEvent* event, GtkWindow* window) {
-  g_message("HandleQuit called");
-
-  if (g_handler.get()) {
-    g_handler->QuittingApp(true);
+// TODO: this is not yet called to shutdown Brackets
+gboolean HandleQuit() {
+  
+  if (!isReallyClosing && g_handler.get()) {
     g_handler->DispatchCloseToNextBrowser();
   }
   else 
   {
-    destroy();
+    if(!g_handler.get() || g_handler->HasWindows()) {
+      CefQuitMessageLoop();
+      return FALSE;
+    }
   }
   
   return TRUE;
-}
-
-// TODO: this is not yet called to shutdown Brackets
-gboolean HandleQuit() {
-  g_message("HandleQuit called");
-  
-  g_message("isReallyClosing %s", (isReallyClosing ? "True" : "False"));
-  if (!isReallyClosing && g_handler.get()) {
-    CefRefPtr<CefBrowser> browser = g_handler->GetBrowser();
-  
-    //CefRefPtr<CommandCallback> callback = new CloseWindowCommandCallback(browser);
-
-    //g_handler->SendJSCommand(browser, FILE_CLOSE_WINDOW, callback);
-    g_message("Close the browser");
     
-    browser->GetHost()->CloseBrowser(false);
-    // Cancel the close
-    return TRUE;
-  }
-
-  if (isReallyClosing) 
-    destroy();
-  
-  return FALSE;
 }
 
 bool FileExists(std::string path) {
@@ -391,7 +368,6 @@ int main(int argc, char* argv[]) {
 
   CefRunMessageLoop();
 
-  g_message("Shutdown CEF");
   CefShutdown();
 
   return 0;
diff --git a/appshell/client_handler.cpp b/appshell/client_handler.cpp
index ce90cff15..6787f0e5a 100644
--- a/appshell/client_handler.cpp
+++ b/appshell/client_handler.cpp
@@ -46,26 +46,26 @@ bool ClientHandler::OnProcessMessageReceived(
     CefProcessId source_process,
     CefRefPtr<CefProcessMessage> message) {
   bool handled = false;
-
+  
   // Check for callbacks first
   if (message->GetName() == "executeCommandCallback") {
     int32 commandId = message->GetArgumentList()->GetInt(0);
     bool result = message->GetArgumentList()->GetBool(1);
-
+    
     CefRefPtr<CommandCallback> callback = command_callback_map_[commandId];
     callback->CommandComplete(result);
     command_callback_map_.erase(commandId);
-
+    
     handled = true;
   }
-
+  
   // Execute delegate callbacks.
   ProcessMessageDelegateSet::iterator it = process_message_delegates_.begin();
   for (; it != process_message_delegates_.end() && !handled; ++it) {
     handled = (*it)->OnProcessMessageReceived(this, browser, source_process,
                                               message);
   }
-
+    
   return handled;
 }
 
@@ -165,16 +165,15 @@ void ClientHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
 void ClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
   REQUIRE_UI_THREAD();
 
-  g_message("OnBeforeClose called");
   if (CanCloseBrowser(browser)) {
     if (m_BrowserId == browser->GetIdentifier()) {
       // Free the browser pointer so that the browser can be destroyed
       m_Browser = NULL;
-    }
+	}
 
     browser_window_map_.erase((ClientWindowHandle)browser->GetHost()->GetWindowHandle());
   }
-
+  
   if (m_quitting) {
     // Changed the logic to call CefQuitMesaageLoop()
     // for windows as it was crashing with 2171 CEF.
@@ -191,7 +190,7 @@ bool ClientHandler::OnDragEnter(CefRefPtr<CefBrowser> browser,
                                 CefRefPtr<CefDragData> dragData,
                                 DragOperationsMask mask) {
     REQUIRE_UI_THREAD();
-
+    
     if (dragData->IsFile()) {
         gDroppedFiles.clear();
         // Store the dragged files in a vector for later use
@@ -230,7 +229,7 @@ void ClientHandler::OnLoadError(CefRefPtr<CefBrowser> browser,
 
   // Display a load error message.
   std::stringstream ss;
-
+  
   ss << "<html>" <<
         "<head>" <<
         "  <style type='text/css'>" <<
@@ -280,7 +279,7 @@ bool ClientHandler::OnConsoleMessage(CefRefPtr<CefBrowser> browser,
   // Don't write the message to a console.log file. Instead, we'll just
   // return false here so the message gets written to the console (output window
   // in xcode, or console window in dev tools)
-
+  
 /*
   REQUIRE_UI_THREAD();
 
@@ -456,7 +455,7 @@ void ClientHandler::DispatchCloseToNextBrowser()
 
       // Bring the window to the front before sending the command
       BringBrowserWindowToFront(browser);
-
+    
       // This call initiates a quit sequence. We will continue to close browser windows
       // unless AbortQuit() is called.
       m_quitting = true;

From 7f5f712ce00885035ba4b7113ec384ae53d0641a Mon Sep 17 00:00:00 2001
From: Prashanth Nethi <prashant@adobe.com>
Date: Tue, 3 Feb 2015 05:45:18 -0800
Subject: [PATCH 13/15] Fixed a defect found in code review

---
 appshell/cefclient_gtk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appshell/cefclient_gtk.cpp b/appshell/cefclient_gtk.cpp
index e4733d9ee..284cad2b5 100644
--- a/appshell/cefclient_gtk.cpp
+++ b/appshell/cefclient_gtk.cpp
@@ -84,7 +84,7 @@ gboolean HandleQuit() {
   }
   else 
   {
-    if(!g_handler.get() || g_handler->HasWindows()) {
+    if(!g_handler.get() || !g_handler->HasWindows()) {
       CefQuitMessageLoop();
       return FALSE;
     }

From 40600f60f8f5c1fa46eb66b35d1fbbc2873dd3e8 Mon Sep 17 00:00:00 2001
From: Jason San Jose <jasonsj@adobe.com>
Date: Thu, 5 Feb 2015 16:49:49 -0800
Subject: [PATCH 14/15] jslint error

---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 45dabe3db..8e49a80c1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -160,7 +160,7 @@ module.exports = function (grunt) {
                             "icudtl.dat",
                             "appshell*.png",
                             "Brackets",
-                            "Brackets-node",
+                            "Brackets-node"
                         ],
                         "dest"      : "<%= build.staging %>"
                     },

From 75e258a785fea0c4649935d158257b511092f939 Mon Sep 17 00:00:00 2001
From: Jason San Jose <jasonsj@adobe.com>
Date: Fri, 6 Feb 2015 09:26:45 -0800
Subject: [PATCH 15/15] remove client_handler AfterClose

---
 appshell/client_handler.h       | 1 -
 appshell/client_handler_gtk.cpp | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/appshell/client_handler.h b/appshell/client_handler.h
index bb73e3fbd..c5ce03490 100644
--- a/appshell/client_handler.h
+++ b/appshell/client_handler.h
@@ -231,7 +231,6 @@ class ClientHandler : public CefClient,
   void QuittingApp(bool quitting) { m_quitting = quitting; }
   bool AppIsQuitting() { return m_quitting; }
   bool HasWindows() const { return !browser_window_map_.empty(); }
-  virtual void AfterClose() OVERRIDE;
   
  protected:
   void SetLoading(bool isLoading);
diff --git a/appshell/client_handler_gtk.cpp b/appshell/client_handler_gtk.cpp
index 0f05269bf..2ab525374 100644
--- a/appshell/client_handler_gtk.cpp
+++ b/appshell/client_handler_gtk.cpp
@@ -99,10 +99,6 @@ void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) {
 #endif // SHOW_TOOLBAR_UI
 }
 
-void ClientHandler::AfterClose() {
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(g_handler->GetMainHwnd())));
-}
-
 void ClientHandler::ComputePopupPlacement(CefWindowInfo& windowInfo)
 {
   // TODO Finish this thing