Update to Chromium revision cb947c01 (#352221)

- Implement CefRequestHandler::OnBeforeBrowse using NavigationThrottle
  instead of ResourceThrottle (see http://crbug.com/537634). The CefRequest
  object passed to OnBeforeBrowse will no longer have an associated request
  identifier.
- Mac: Remove additional helper apps which are no longer required (see
  http://crbug.com/520680)
- Remove the UR_FLAG_REPORT_RAW_HEADERS flag which is no longer supported (see
  http://crbug.com/517114)
- Remove the CefBrowserSettings.java parameter. Java is an NPAPI plugin and
  NPAPI plugins are no longer supported (see http://crbug.com/470301#c11)
- Add CefFormatUrlForSecurityDisplay function in cef_parser.h
- Fix crash when passing `--disable-extensions` command-line flag (issue #1721)
- Linux: Fix NSS handler loading (issue #1727)
This commit is contained in:
Marshall Greenblatt
2015-10-09 11:23:12 -04:00
parent 5780ea8baa
commit 8aac23386e
104 changed files with 938 additions and 940 deletions

View File

@@ -1,5 +1,5 @@
diff --git common.gypi common.gypi
index cff7376..d16e12d 100644
index cce7b3c..84a702a 100644
--- common.gypi
+++ common.gypi
@@ -9,6 +9,9 @@
@@ -25,18 +25,3 @@ index c9cf226..0dedbe3 100755
stdout=subprocess.PIPE)
archs = []
diff --git vs_toolchain.py vs_toolchain.py
index cea0d6d..158d0a8 100755
--- vs_toolchain.py
+++ vs_toolchain.py
@@ -32,8 +32,8 @@ def SetEnvironmentAndGetRuntimeDllDirs():
bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')))
# When running on a non-Windows host, only do this if the SDK has explicitly
# been downloaded before (in which case json_data_file will exist).
- if ((sys.platform in ('win32', 'cygwin') and depot_tools_win_toolchain) or
- os.path.exists(json_data_file)):
+ if ((sys.platform in ('win32', 'cygwin') or os.path.exists(json_data_file)) and
+ depot_tools_win_toolchain):
if not os.path.exists(json_data_file):
Update()
with open(json_data_file, 'r') as tempf: