Remove an unused patch to ContentBrowserClient (issue #1161).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2044 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
2025-06-05 21:39:12 +02:00 · 2015-03-04 01:15:50 +00:00
parent ac4f451c94
commit 4edc996180
4 changed files with 29 additions and 67 deletions
--- a/patch/patches/public_browser_1257.patch
+++ b/patch/patches/public_browser_1257.patch
@@ -0,0 +1,95 @@
+diff --git web_contents.cc web_contents.cc
+index aece7c6..63da2c9 100644
+--- web_contents.cc
+++ web_contents.cc
+@@ -18,7 +18,9 @@ WebContents::CreateParams::CreateParams(BrowserContext* context)
+       initially_hidden(false),
+       guest_delegate(nullptr),
+       context(nullptr),
+-      renderer_initiated_creation(false) {}
+      renderer_initiated_creation(false),
+      view(nullptr),
+      delegate_view(nullptr) {}
+ 
+ WebContents::CreateParams::CreateParams(
+     BrowserContext* context, SiteInstance* site)
+@@ -31,7 +33,9 @@ WebContents::CreateParams::CreateParams(
+       initially_hidden(false),
+       guest_delegate(nullptr),
+       context(nullptr),
+-      renderer_initiated_creation(false) {}
+      renderer_initiated_creation(false),
+      view(nullptr),
+      delegate_view(nullptr) {}
+ 
+ WebContents::CreateParams::~CreateParams() {
+ }
+diff --git web_contents.h web_contents.h
+index 493abd8..eface7b 100644
+--- web_contents.h
+++ web_contents.h
+@@ -52,9 +52,11 @@ class PageState;
+ class RenderFrameHost;
+ class RenderProcessHost;
+ class RenderViewHost;
+class RenderViewHostDelegateView;
+ class RenderWidgetHostView;
+ class SiteInstance;
+ class WebContentsDelegate;
+class WebContentsView;
+ struct CustomContextMenuContext;
+ struct DropData;
+ struct Manifest;
+@@ -128,6 +130,10 @@ class WebContents : public PageNavigator,
+     // RenderFrame, have already been created on the renderer side, and
+     // WebContents construction should take this into account.
+     bool renderer_initiated_creation;
+
+    // Optionally specify the view and delegate view.
+    content::WebContentsView* view;
+    content::RenderViewHostDelegateView* delegate_view;
+   };
+ 
+   // Creates a new WebContents.
+diff --git web_contents_delegate.cc web_contents_delegate.cc
+index 461927c..2217377 100644
+--- web_contents_delegate.cc
+++ web_contents_delegate.cc
+@@ -137,7 +137,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
+     const base::string16& frame_name,
+     const GURL& target_url,
+     const std::string& partition_id,
+-    SessionStorageNamespace* session_storage_namespace) {
+    SessionStorageNamespace* session_storage_namespace,
+    content::WebContentsView** view,
+    content::RenderViewHostDelegateView** delegate_view) {
+   return true;
+ }
+ 
+diff --git web_contents_delegate.h web_contents_delegate.h
+index d88b27c..fefbed2 100644
+--- web_contents_delegate.h
+++ web_contents_delegate.h
+@@ -36,9 +36,11 @@ class DownloadItem;
+ class JavaScriptDialogManager;
+ class PageState;
+ class RenderViewHost;
+class RenderViewHostDelegateView;
+ class SessionStorageNamespace;
+ class WebContents;
+ class WebContentsImpl;
+class WebContentsView;
+ struct ColorSuggestion;
+ struct ContextMenuParams;
+ struct DropData;
+@@ -314,7 +316,9 @@ class CONTENT_EXPORT WebContentsDelegate {
+       const base::string16& frame_name,
+       const GURL& target_url,
+       const std::string& partition_id,
+-      SessionStorageNamespace* session_storage_namespace);
+      SessionStorageNamespace* session_storage_namespace,
+      content::WebContentsView** view,
+      content::RenderViewHostDelegateView** delegate_view);
+ 
+   // Notifies the delegate about the creation of a new WebContents. This
+   // typically happens when popups are created.