Update to Chromium version 69.0.3497.32

This commit is contained in:
Marshall Greenblatt
2018-08-15 17:01:54 -04:00
parent 17f0192053
commit 7ed3a545e9
14 changed files with 57 additions and 56 deletions

View File

@@ -208,10 +208,10 @@ index 9e3511a9dabc..83dfee968d59 100644
RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override;
diff --git content/browser/web_contents/web_contents_view_mac.h content/browser/web_contents/web_contents_view_mac.h
index 2e3f4f8a56d4..75ef26b5381a 100644
index 7f80c1b1d829..bcbd04bc4e6c 100644
--- content/browser/web_contents/web_contents_view_mac.h
+++ content/browser/web_contents/web_contents_view_mac.h
@@ -96,7 +96,7 @@ class WebContentsViewMac : public WebContentsView,
@@ -97,7 +97,7 @@ class WebContentsViewMac : public WebContentsView,
gfx::NativeView context) override;
RenderWidgetHostViewBase* CreateViewForWidget(
RenderWidgetHost* render_widget_host,
@@ -221,7 +221,7 @@ index 2e3f4f8a56d4..75ef26b5381a 100644
RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override;
diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm
index 03d7c9c7dcce..e84c1787a84d 100644
index 94848b568363..4dea19adb512 100644
--- content/browser/web_contents/web_contents_view_mac.mm
+++ content/browser/web_contents/web_contents_view_mac.mm
@@ -345,7 +345,8 @@ void WebContentsViewMac::CreateView(