Update to Chromium revision 68623971 (#403382)

This commit is contained in:
Marshall Greenblatt
2016-07-06 15:34:09 -04:00
parent d0a2e217a0
commit a60bb077a3
55 changed files with 437 additions and 283 deletions

View File

@@ -1,8 +1,8 @@
diff --git ui/browser.cc ui/browser.cc
index 14a9336..6f26daf 100644
index b10b2df..a47dd18 100644
--- ui/browser.cc
+++ ui/browser.cc
@@ -1614,7 +1614,9 @@ bool Browser::ShouldCreateWebContents(
@@ -1618,7 +1618,9 @@ bool Browser::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -14,10 +14,10 @@ index 14a9336..6f26daf 100644
// If a BackgroundContents is created, suppress the normal WebContents.
return !MaybeCreateBackgroundContents(
diff --git ui/browser.h ui/browser.h
index 01f2880..e741e21 100644
index 693e84d..be1f1dd 100644
--- ui/browser.h
+++ ui/browser.h
@@ -616,7 +616,9 @@ class Browser : public TabStripModelObserver,
@@ -617,7 +617,9 @@ class Browser : public TabStripModelObserver,
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,