Update to Chromium revision 267aeeb8 (#297060).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1863 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-10-10 17:54:35 +00:00
parent aa45672d53
commit 57d47f64b5
20 changed files with 68 additions and 67 deletions

View File

@@ -89,7 +89,7 @@ index 4f0d625..01083ac 100644
// Creates a new WebContents.
diff --git web_contents_delegate.cc web_contents_delegate.cc
index 72cabb4..32765ba 100644
index f264df7..bded79a 100644
--- web_contents_delegate.cc
+++ web_contents_delegate.cc
@@ -136,7 +136,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
@@ -104,7 +104,7 @@ index 72cabb4..32765ba 100644
}
diff --git web_contents_delegate.h web_contents_delegate.h
index 457b3c0..734fc87 100644
index 2cfcdf7..7adde8e 100644
--- web_contents_delegate.h
+++ web_contents_delegate.h
@@ -36,9 +36,11 @@ class DownloadItem;
@@ -119,7 +119,7 @@ index 457b3c0..734fc87 100644
struct ColorSuggestion;
struct ContextMenuParams;
struct DropData;
@@ -314,7 +316,9 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -313,7 +315,9 @@ class CONTENT_EXPORT WebContentsDelegate {
const base::string16& frame_name,
const GURL& target_url,
const std::string& partition_id,