Update to Chromium version 81.0.4044.34

This commit is contained in:
Marshall Greenblatt
2020-03-04 15:42:20 -05:00
parent 1ab44722e8
commit dfbb9418fc
16 changed files with 44 additions and 43 deletions

View File

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

View File

@@ -95,7 +95,7 @@ index e0da20cc3bb6..b3f6720dff90 100644
base::PostTask( base::PostTask(
FROM_HERE, {content::BrowserThread::UI}, FROM_HERE, {content::BrowserThread::UI},
diff --git chrome/browser/optimization_guide/optimization_guide_navigation_data.cc chrome/browser/optimization_guide/optimization_guide_navigation_data.cc diff --git chrome/browser/optimization_guide/optimization_guide_navigation_data.cc chrome/browser/optimization_guide/optimization_guide_navigation_data.cc
index b532a58d5db7..e6d30ce29ea1 100644 index a0ff050271dd..b9337420565e 100644
--- chrome/browser/optimization_guide/optimization_guide_navigation_data.cc --- chrome/browser/optimization_guide/optimization_guide_navigation_data.cc
+++ chrome/browser/optimization_guide/optimization_guide_navigation_data.cc +++ chrome/browser/optimization_guide/optimization_guide_navigation_data.cc
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
@@ -106,7 +106,7 @@ index b532a58d5db7..e6d30ce29ea1 100644
#include "chrome/browser/optimization_guide/optimization_guide_web_contents_observer.h" #include "chrome/browser/optimization_guide/optimization_guide_web_contents_observer.h"
#include "components/optimization_guide/hints_processing_util.h" #include "components/optimization_guide/hints_processing_util.h"
#include "content/public/browser/navigation_handle.h" #include "content/public/browser/navigation_handle.h"
@@ -16,25 +17,6 @@ @@ -17,25 +18,6 @@
#include "services/metrics/public/cpp/ukm_source.h" #include "services/metrics/public/cpp/ukm_source.h"
#include "services/metrics/public/cpp/ukm_source_id.h" #include "services/metrics/public/cpp/ukm_source_id.h"
@@ -133,7 +133,7 @@ index b532a58d5db7..e6d30ce29ea1 100644
int64_t navigation_id) int64_t navigation_id)
: navigation_id_(navigation_id) {} : navigation_id_(navigation_id) {}
diff --git chrome/browser/optimization_guide/prediction/prediction_manager.cc chrome/browser/optimization_guide/prediction/prediction_manager.cc diff --git chrome/browser/optimization_guide/prediction/prediction_manager.cc chrome/browser/optimization_guide/prediction/prediction_manager.cc
index 7b7567f55df2..3b204a446187 100644 index c4a15ba4540c..947ed8abb02a 100644
--- chrome/browser/optimization_guide/prediction/prediction_manager.cc --- chrome/browser/optimization_guide/prediction/prediction_manager.cc
+++ chrome/browser/optimization_guide/prediction/prediction_manager.cc +++ chrome/browser/optimization_guide/prediction/prediction_manager.cc
@@ -62,7 +62,9 @@ bool ShouldUseCurrentOptimizationTargetDecision( @@ -62,7 +62,9 @@ bool ShouldUseCurrentOptimizationTargetDecision(
@@ -160,7 +160,7 @@ index 7b7567f55df2..3b204a446187 100644
// Util class for recording the state of a prediction model. The result is // Util class for recording the state of a prediction model. The result is
// recorded when it goes out of scope and its destructor is called. // recorded when it goes out of scope and its destructor is called.
@@ -822,12 +826,12 @@ void PredictionManager::ScheduleModelsAndHostModelFeaturesFetch() { @@ -838,12 +842,12 @@ void PredictionManager::ScheduleModelsAndHostModelFeaturesFetch() {
model_and_features_store_->GetHostModelFeaturesUpdateTime() - model_and_features_store_->GetHostModelFeaturesUpdateTime() -
clock_->Now(); clock_->Now();
const base::TimeDelta time_until_retry = const base::TimeDelta time_until_retry =
@@ -787,7 +787,7 @@ index 73533fba5b15..42859c57dcd7 100644
const GLenum target = GL_TEXTURE_2D; const GLenum target = GL_TEXTURE_2D;
const GLuint service_id = const GLuint service_id =
diff --git media/muxers/webm_muxer.h media/muxers/webm_muxer.h diff --git media/muxers/webm_muxer.h media/muxers/webm_muxer.h
index 0d9b8c6de789..d78badac69b2 100644 index a53a3e0e3803..7ca35c681c35 100644
--- media/muxers/webm_muxer.h --- media/muxers/webm_muxer.h
+++ media/muxers/webm_muxer.h +++ media/muxers/webm_muxer.h
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 477e30a34cd2..7a24ff410e7e 100644 index 6f768f7848a3..363718020f94 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/features.gni") @@ -11,6 +11,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index 477e30a34cd2..7a24ff410e7e 100644
import("//chrome/browser/buildflags.gni") import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//components/captive_portal/core/features.gni") import("//components/captive_portal/core/features.gni")
@@ -1956,6 +1957,7 @@ jumbo_static_library("browser") { @@ -1958,6 +1959,7 @@ jumbo_static_library("browser") {
"//base/util/values:values_util", "//base/util/values:values_util",
"//build:branding_buildflags", "//build:branding_buildflags",
"//cc", "//cc",
@@ -18,7 +18,7 @@ index 477e30a34cd2..7a24ff410e7e 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2275,6 +2277,10 @@ jumbo_static_library("browser") { @@ -2277,6 +2279,10 @@ jumbo_static_library("browser") {
] ]
} }

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index c820df8447f0..58cb1279b7bf 100644 index efacc93f730f..81625e668dbb 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/features.gni") @@ -9,6 +9,7 @@ import("//build/config/features.gni")
@@ -29,7 +29,7 @@ index c820df8447f0..58cb1279b7bf 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -1438,6 +1444,7 @@ jumbo_static_library("ui") { @@ -1437,6 +1443,7 @@ jumbo_static_library("ui") {
"//components/keep_alive_registry", "//components/keep_alive_registry",
"//components/network_session_configurator/common", "//components/network_session_configurator/common",
"//components/page_load_metrics/browser", "//components/page_load_metrics/browser",

View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 6cdca1affb9f..f875ba1a5d75 100644 index 769422feb85c..1805baad312b 100644
--- chrome/browser/chrome_content_browser_client.cc --- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc
@@ -1027,10 +1027,6 @@ void LaunchURL(const GURL& url, @@ -1028,10 +1028,6 @@ void LaunchURL(const GURL& url,
} }
} }
@@ -13,7 +13,7 @@ index 6cdca1affb9f..f875ba1a5d75 100644
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) { void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
// |allowlist| combines pref/policy + cmdline switch in the browser process. // |allowlist| combines pref/policy + cmdline switch in the browser process.
// For renderer and utility (e.g. NetworkService) processes the switch is the // For renderer and utility (e.g. NetworkService) processes the switch is the
@@ -1125,6 +1121,14 @@ void MaybeRecordSameSiteCookieEngagementHistogram( @@ -1126,6 +1122,14 @@ void MaybeRecordSameSiteCookieEngagementHistogram(
} // namespace } // namespace

View File

@@ -165,15 +165,16 @@ index 4e64db143b8a..71322b0261a1 100644
Profile* profile = Profile::FromBrowserContext(browser_context); Profile* profile = Profile::FromBrowserContext(browser_context);
std::vector<std::string> whitelist = MimeTypesHandler::GetMIMETypeWhitelist(); std::vector<std::string> whitelist = MimeTypesHandler::GetMIMETypeWhitelist();
diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
index a7e5caea5add..f9d11b317946 100644 index cce1eac38785..9343ff520a87 100644
--- chrome/common/google_url_loader_throttle.cc --- chrome/common/google_url_loader_throttle.cc
+++ chrome/common/google_url_loader_throttle.cc +++ chrome/common/google_url_loader_throttle.cc
@@ -4,10 +4,15 @@ @@ -5,11 +5,16 @@
#include "chrome/common/google_url_loader_throttle.h" #include "chrome/common/google_url_loader_throttle.h"
#include "build/build_config.h"
+#include "cef/libcef/features/features.h" +#include "cef/libcef/features/features.h"
#include "chrome/common/net/safe_search_util.h" #include "chrome/common/net/safe_search_util.h"
#include "components/google/core/common/google_util.h"
#include "components/variations/net/variations_http_headers.h" #include "components/variations/net/variations_http_headers.h"
#include "services/network/public/mojom/url_response_head.mojom.h" #include "services/network/public/mojom/url_response_head.mojom.h"
@@ -184,7 +185,7 @@ index a7e5caea5add..f9d11b317946 100644
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
#include "extensions/common/extension_urls.h" #include "extensions/common/extension_urls.h"
#endif #endif
@@ -96,6 +101,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse( @@ -127,6 +132,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
const GURL& response_url, const GURL& response_url,
network::mojom::URLResponseHead* response_head, network::mojom::URLResponseHead* response_head,
bool* defer) { bool* defer) {

View File

@@ -224,10 +224,10 @@ index 632ae86c6fd6..55b749ec1242 100644
const std::vector<WebPluginInfo>& all_plugins); const std::vector<WebPluginInfo>& all_plugins);
diff --git content/common/frame_messages.h content/common/frame_messages.h diff --git content/common/frame_messages.h content/common/frame_messages.h
index 4370f99c9a51..8dc0736e2b59 100644 index 4a4085021a61..d822c9c99e06 100644
--- content/common/frame_messages.h --- content/common/frame_messages.h
+++ content/common/frame_messages.h +++ content/common/frame_messages.h
@@ -826,9 +826,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, @@ -825,9 +825,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// type. If there is no matching plugin, |found| is false. // type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the // |actual_mime_type| is the actual mime type supported by the
// found plugin. // found plugin.
@@ -327,10 +327,10 @@ index 87df60c52d1e..c3841a7845dd 100644
// started. // started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
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 00bbbdc9b82d..a3c923fcc442 100644 index 3f3f5da903d4..00af07f80d4c 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
@@ -3796,7 +3796,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -3798,7 +3798,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type; std::string mime_type;
bool found = false; bool found = false;
Send(new FrameHostMsg_GetPluginInfo( Send(new FrameHostMsg_GetPluginInfo(

View File

@@ -1,8 +1,8 @@
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
index 7d23fc08f7ea..24a41cf936da 100644 index 021f7ad27b92..4c42a1a5fc5b 100644
--- chrome/test/BUILD.gn --- chrome/test/BUILD.gn
+++ chrome/test/BUILD.gn +++ chrome/test/BUILD.gn
@@ -4852,7 +4852,7 @@ test("unit_tests") { @@ -4858,7 +4858,7 @@ test("unit_tests") {
if (use_gio) { if (use_gio) {
configs += [ "//build/linux:gio_config" ] configs += [ "//build/linux:gio_config" ]
} }
@@ -11,7 +11,7 @@ index 7d23fc08f7ea..24a41cf936da 100644
deps += [ "//chrome/browser/ui/gtk" ] deps += [ "//chrome/browser/ui/gtk" ]
} }
@@ -5833,7 +5833,7 @@ if (!is_android) { @@ -5839,7 +5839,7 @@ if (!is_android) {
# suites, it seems like one or another starts timing out too. # suites, it seems like one or another starts timing out too.
"../browser/ui/views/keyboard_access_browsertest.cc", "../browser/ui/views/keyboard_access_browsertest.cc",
] ]

View File

@@ -41,10 +41,10 @@ index cc4b13a7b9c6..84f3b9ed7cf4 100644
} // namespace content } // namespace content
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
index 954011b5d562..da67cd106cec 100644 index 545277f7ec1b..ad1128f48d98 100644
--- content/browser/renderer_host/render_widget_host_impl.cc --- content/browser/renderer_host/render_widget_host_impl.cc
+++ content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -2606,6 +2606,11 @@ void RenderWidgetHostImpl::DidStartScrollingViewport() { @@ -2595,6 +2595,11 @@ void RenderWidgetHostImpl::DidStartScrollingViewport() {
view_->set_is_currently_scrolling_viewport(true); view_->set_is_currently_scrolling_viewport(true);
} }
@@ -57,10 +57,10 @@ index 954011b5d562..da67cd106cec 100644
const WebInputEvent& event) { const WebInputEvent& event) {
if ((base::FeatureList::IsEnabled( if ((base::FeatureList::IsEnabled(
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
index 9faf49a3fd83..26c6845c53c3 100644 index b94e1b22a72f..2cc7bde0adcc 100644
--- content/browser/renderer_host/render_widget_host_impl.h --- content/browser/renderer_host/render_widget_host_impl.h
+++ content/browser/renderer_host/render_widget_host_impl.h +++ content/browser/renderer_host/render_widget_host_impl.h
@@ -701,6 +701,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl @@ -691,6 +691,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
void ProgressFlingIfNeeded(base::TimeTicks current_time); void ProgressFlingIfNeeded(base::TimeTicks current_time);
void StopFling(); void StopFling();

View File

@@ -35,7 +35,7 @@ index 04c03cfcb774..4f5488ef1699 100644
bool record_whole_document; bool record_whole_document;
diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
index bd44565e78aa..dcb7bbd6d875 100644 index f93c2cb36a58..f6a33d46e3ea 100644
--- content/renderer/render_view_impl.cc --- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc
@@ -968,6 +968,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, @@ -968,6 +968,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,

View File

@@ -139,10 +139,10 @@ index 5dbc9d2dfcfb..1c31d97825c2 100644
void CookieManager::SetForceKeepSessionState() { void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc diff --git services/network/network_context.cc services/network/network_context.cc
index e5dfb9c6fd20..07578a987dd9 100644 index dbac9a64fe49..ff55f0795664 100644
--- services/network/network_context.cc --- services/network/network_context.cc
+++ services/network/network_context.cc +++ services/network/network_context.cc
@@ -1765,6 +1765,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -1747,6 +1747,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
} }
scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store; scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store;
@@ -150,7 +150,7 @@ index e5dfb9c6fd20..07578a987dd9 100644
if (params_->cookie_path) { if (params_->cookie_path) {
scoped_refptr<base::SequencedTaskRunner> client_task_runner = scoped_refptr<base::SequencedTaskRunner> client_task_runner =
base::ThreadTaskRunnerHandle::Get(); base::ThreadTaskRunnerHandle::Get();
@@ -1792,18 +1793,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -1774,18 +1775,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
session_cleanup_cookie_store = session_cleanup_cookie_store =
base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store); base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store);

View File

@@ -80,7 +80,7 @@ index 1026b739d283..fe562ab60ce9 100644
private: private:
const HWND hwnd_; const HWND hwnd_;
diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
index 7a1277ad28ed..4a426441e505 100644 index 5cd92d7a38ee..77ea93a1a98e 100644
--- components/viz/service/BUILD.gn --- components/viz/service/BUILD.gn
+++ components/viz/service/BUILD.gn +++ components/viz/service/BUILD.gn
@@ -13,7 +13,10 @@ config("viz_service_implementation") { @@ -13,7 +13,10 @@ config("viz_service_implementation") {

View File

@@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index ea2e52bf16dd..d77c3f7b991a 100644 index 4e6457e56ed5..d2a5437fc043 100644
--- content/browser/web_contents/web_contents_impl.cc --- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc
@@ -2062,15 +2062,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2085,15 +2085,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name; std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -33,7 +33,7 @@ index ea2e52bf16dd..d77c3f7b991a 100644
} }
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -2881,6 +2888,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( @@ -2904,6 +2911,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
// objects. // objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance; create_params.renderer_initiated_creation = !is_new_browsing_instance;
@@ -49,7 +49,7 @@ index ea2e52bf16dd..d77c3f7b991a 100644
// If |is_new_browsing_instance| is true, defer routing_id allocation // If |is_new_browsing_instance| is true, defer routing_id allocation
// to the WebContentsImpl::Create() call. This is required because with // to the WebContentsImpl::Create() call. This is required because with
// a new browsing instance, WebContentsImpl::Create() may elect a different // a new browsing instance, WebContentsImpl::Create() may elect a different
@@ -6308,6 +6324,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, @@ -6329,6 +6345,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents. // This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary(); SetAsFocusedWebContentsIfNecessary();
} }

View File

@@ -44,10 +44,10 @@ index 8df9cdf40707..746e15c5884c 100644
} }
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 0cf193d31a02..1c62098d3a6a 100644 index 6aa9046f5014..cb8174bef9c8 100644
--- third_party/blink/renderer/core/frame/local_frame.cc --- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1199,7 +1199,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { @@ -1200,7 +1200,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
PluginData* LocalFrame::GetPluginData() const { PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr; return nullptr;

View File

@@ -11,7 +11,7 @@ index a6d03eca18db..d84e8615150c 100644
// Cancels and hides the current popup (datetime, select...) if any. // Cancels and hides the current popup (datetime, select...) if any.
virtual void CancelPagePopup() = 0; virtual void CancelPagePopup() = 0;
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index 7f58ed742695..2149f7815d57 100644 index e713926c6ebb..788b8443f8aa 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc --- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -216,8 +216,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -216,8 +216,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {

View File

@@ -1,8 +1,8 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 30da9de5bf78..29366b337312 100644 index 5a58de4b044d..d5b14449d73c 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -4963,7 +4963,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4977,7 +4977,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message> </message>
</if> </if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy."> <message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">