Update to Chromium version 59.0.3071.15

This commit is contained in:
Marshall Greenblatt
2017-04-24 17:47:41 -04:00
parent 3f71138d64
commit 86237f0928
4 changed files with 11 additions and 11 deletions

View File

@@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'a106f0abbf69dad349d4aaf4bcc4f5d376dd2377', 'chromium_checkout': 'refs/tags/59.0.3071.15',
} }

View File

@@ -405,7 +405,7 @@ index d544fb7..260079c 100644
// built in media player for the given |url|. Defaults to false. // built in media player for the given |url|. Defaults to false.
virtual bool ShouldUseMediaPlayerForURL(const GURL& url); virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 6922b94..473d148 100644 index 32ad5da..39fbe72 100644
--- content/renderer/render_frame_impl.cc --- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc
@@ -2795,7 +2795,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -2795,7 +2795,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -418,7 +418,7 @@ index 6922b94..473d148 100644
params.mime_type.Utf8(), &found, &info, &mime_type)); params.mime_type.Utf8(), &found, &info, &mime_type));
if (!found) if (!found)
return NULL; return NULL;
@@ -5364,9 +5365,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -5362,9 +5363,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
(!IsBrowserSideNavigationEnabled() || (!IsBrowserSideNavigationEnabled() ||
url != pending_navigation_params_->request_params.redirects[0])); url != pending_navigation_params_->request_params.redirects[0]));
@@ -430,7 +430,7 @@ index 6922b94..473d148 100644
// The handlenavigation API is deprecated and will be removed once // The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved. // crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation( if (GetContentClient()->renderer()->HandleNavigation(
@@ -5379,7 +5379,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -5377,7 +5377,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
} }
return blink::kWebNavigationPolicyIgnore; return blink::kWebNavigationPolicyIgnore;
} }

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/views/BUILD.gn chrome/browser/ui/views/BUILD.gn diff --git chrome/browser/ui/views/BUILD.gn chrome/browser/ui/views/BUILD.gn
index 47aa8b5bdbc9..d198a017a63c 100644 index 47aa8b5..d198a01 100644
--- chrome/browser/ui/views/BUILD.gn --- chrome/browser/ui/views/BUILD.gn
+++ chrome/browser/ui/views/BUILD.gn +++ chrome/browser/ui/views/BUILD.gn
@@ -27,6 +27,7 @@ component("views") { @@ -27,6 +27,7 @@ component("views") {
@@ -11,7 +11,7 @@ index 47aa8b5bdbc9..d198a017a63c 100644
"//skia", "//skia",
"//ui/base", "//ui/base",
diff --git extensions/browser/api/BUILD.gn extensions/browser/api/BUILD.gn diff --git extensions/browser/api/BUILD.gn extensions/browser/api/BUILD.gn
index dcf2bdb8fe74..96c9bf870c67 100644 index dcf2bdb..96c9bf8 100644
--- extensions/browser/api/BUILD.gn --- extensions/browser/api/BUILD.gn
+++ extensions/browser/api/BUILD.gn +++ extensions/browser/api/BUILD.gn
@@ -25,6 +25,8 @@ source_set("api") { @@ -25,6 +25,8 @@ source_set("api") {
@@ -24,7 +24,7 @@ index dcf2bdb8fe74..96c9bf870c67 100644
"//extensions/browser/api/alarms", "//extensions/browser/api/alarms",
"//extensions/browser/api/app_current_window_internal", "//extensions/browser/api/app_current_window_internal",
diff --git extensions/common/BUILD.gn extensions/common/BUILD.gn diff --git extensions/common/BUILD.gn extensions/common/BUILD.gn
index 8af643d9d426..189cf47e7756 100644 index 8af643d..189cf47 100644
--- extensions/common/BUILD.gn --- extensions/common/BUILD.gn
+++ extensions/common/BUILD.gn +++ extensions/common/BUILD.gn
@@ -271,6 +271,7 @@ if (enable_extensions) { @@ -271,6 +271,7 @@ if (enable_extensions) {
@@ -44,7 +44,7 @@ index 8af643d9d426..189cf47e7756 100644
"//device/bluetooth", "//device/bluetooth",
"//device/usb", "//device/usb",
diff --git extensions/renderer/BUILD.gn extensions/renderer/BUILD.gn diff --git extensions/renderer/BUILD.gn extensions/renderer/BUILD.gn
index fca1114a561b..b049678396ee 100644 index fca1114..b049678 100644
--- extensions/renderer/BUILD.gn --- extensions/renderer/BUILD.gn
+++ extensions/renderer/BUILD.gn +++ extensions/renderer/BUILD.gn
@@ -245,6 +245,7 @@ source_set("renderer") { @@ -245,6 +245,7 @@ source_set("renderer") {

View File

@@ -1,5 +1,5 @@
diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc
index 0debd91780b5..432d91ef9713 100644 index 0debd91..432d91e 100644
--- services/service_manager/embedder/main.cc --- services/service_manager/embedder/main.cc
+++ services/service_manager/embedder/main.cc +++ services/service_manager/embedder/main.cc
@@ -29,7 +29,6 @@ @@ -29,7 +29,6 @@
@@ -80,7 +80,7 @@ index 0debd91780b5..432d91ef9713 100644
} }
diff --git services/service_manager/embedder/main.h services/service_manager/embedder/main.h diff --git services/service_manager/embedder/main.h services/service_manager/embedder/main.h
index e86697a26d0f..771acd80a3e1 100644 index e86697a..771acd8 100644
--- services/service_manager/embedder/main.h --- services/service_manager/embedder/main.h
+++ services/service_manager/embedder/main.h +++ services/service_manager/embedder/main.h
@@ -5,9 +5,15 @@ @@ -5,9 +5,15 @@
@@ -122,7 +122,7 @@ index e86697a26d0f..771acd80a3e1 100644
} // namespace service_manager } // namespace service_manager
diff --git services/service_manager/embedder/set_process_title.cc services/service_manager/embedder/set_process_title.cc diff --git services/service_manager/embedder/set_process_title.cc services/service_manager/embedder/set_process_title.cc
index 80b9a0ab2ffc..5162354006b0 100644 index 80b9a0a..5162354 100644
--- services/service_manager/embedder/set_process_title.cc --- services/service_manager/embedder/set_process_title.cc
+++ services/service_manager/embedder/set_process_title.cc +++ services/service_manager/embedder/set_process_title.cc
@@ -44,7 +44,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) { @@ -44,7 +44,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {