CEF upgrade related changes. Fixed the following issues

adobe · Apr 19, 2016 · 25ddc3a · 25ddc3a · nethip · Apr 19, 2016
1 parent 11d66b7
commit 25ddc3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/appshell.gyp b/appshell.gyp
@@ -77,6 +77,7 @@
         # Target build path.
         'SYMROOT': 'xcodebuild',
         'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
+        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
         'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
       },
       'conditions': [
@@ -381,6 +382,7 @@
         # Target build path.
         'SYMROOT': 'xcodebuild',
         'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
+        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
         'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
       },
       'conditions': [
@@ -472,6 +474,7 @@
             'OTHER_LDFLAGS': ['-Wl,-headerpad_max_install_names'],
             'SYMROOT': 'xcodebuild',
             'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
+            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
             'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
             'FRAMEWORK_SEARCH_PATHS': [
               '$(inherited)',

diff --git a/appshell/client_handler_mac.mm b/appshell/client_handler_mac.mm
@@ -520,7 +520,7 @@ - (void)windowDidResignKey:(NSNotification *)notification {
 
 
     // CEF 1750 -- We need to not handle keys for the DevTools Window.
-    if (browser->GetFocusedFrame()->GetURL() == "chrome-devtools://devtools/devtools.html") {
+    if (browser->GetFocusedFrame()->GetURL() == "chrome-devtools://devtools/inspector.html") {
         return false;
     }