Merge pull request #127 from adobe/glenn/cef-3.1180.823

Update to CEF 3.1180.823

Author: jasonsanjose

.gitignore

@@ -15,6 +15,7 @@ xcodebuild/*
 *.sdf
 *.opensdf
 *.suo
+*.vcxproj.filters
 *.vcxproj.user
 *.log
 *.dmg

Brackets.vcxproj

@@ -111,21 +111,21 @@ void AppGetSettings(CefSettings& settings, CefRefPtr<ClientApp> app) {
 
   // Retrieve command-line proxy configuration, if any.
   bool has_proxy = false;
-  cef_proxy_type_t proxy_type = PROXY_TYPE_DIRECT;
+  cef_proxy_type_t proxy_type = CEF_PROXY_TYPE_DIRECT;
   CefString proxy_config;
 
   if (g_command_line->HasSwitch(cefclient::kProxyType)) {
     std::string str = g_command_line->GetSwitchValue(cefclient::kProxyType);
     if (str == cefclient::kProxyType_Direct) {
       has_proxy = true;
-      proxy_type = PROXY_TYPE_DIRECT;
+      proxy_type = CEF_PROXY_TYPE_DIRECT;
     } else if (str == cefclient::kProxyType_Named ||
                str == cefclient::kProxyType_Pac) {
       proxy_config = g_command_line->GetSwitchValue(cefclient::kProxyConfig);
       if (!proxy_config.empty()) {
         has_proxy = true;
         proxy_type = (str == cefclient::kProxyType_Named?
-                      PROXY_TYPE_NAMED:PROXY_TYPE_PAC_STRING);
+                      CEF_PROXY_TYPE_NAMED:CEF_PROXY_TYPE_PAC_STRING);
       }
     }
   }

appshell.xcodeproj/project.pbxproj

@@ -164,10 +164,12 @@ - (void)alert:(NSString*)title withMessage:(NSString*)message {
 }
 
 - (void)notifyConsoleMessage:(id)object {
+  /*
   std::stringstream ss;
   ss << "Console messages will be written to " << g_handler->GetLogFile();
   NSString* str = [NSString stringWithUTF8String:(ss.str().c_str())];
   [self alert:@"Console Messages" withMessage:str];
+  */
 }
 
 - (void)notifyDownloadComplete:(id)object {

appshell/cefclient.cpp

@@ -402,13 +402,15 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
 		}
         return 0;
       case ID_WARN_CONSOLEMESSAGE:
+/*
         if (g_handler.get()) {
           std::wstringstream ss;
           ss << L"Console messages will be written to "
               << std::wstring(CefString(g_handler->GetLogFile()));
           MessageBox(hWnd, ss.str().c_str(), L"Console Messages",
               MB_OK | MB_ICONINFORMATION);
         }
+*/
         return 0;
       case ID_WARN_DOWNLOADCOMPLETE:
       case ID_WARN_DOWNLOADERROR:

appshell/cefclient_mac.mm

@@ -195,7 +195,7 @@ class AppShellExtensionHandler : public CefV8Handler {
 
 
 ClientApp::ClientApp()
-    : proxy_type_(PROXY_TYPE_DIRECT) {
+    : proxy_type_(CEF_PROXY_TYPE_DIRECT) {
   CreateRenderDelegates(render_delegates_);
 }