summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser.h
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 19:05:36 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 19:05:36 +0000
commit168329801030758d09443e84cc8f240f3444444b (patch)
tree59f065c6faab21f30bf102f57aad8f0f162ba3a7 /chrome/browser/ui/browser.h
parent8b569383567d535c2a8a836d0421ab55fe760b5e (diff)
downloadchromium_src-168329801030758d09443e84cc8f240f3444444b.zip
chromium_src-168329801030758d09443e84cc8f240f3444444b.tar.gz
chromium_src-168329801030758d09443e84cc8f240f3444444b.tar.bz2
Split RenderViewHostDelegateViewHelper in two.
BUG=93804, 95573 TEST=no visible change Review URL: http://codereview.chromium.org/9008079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.h')
-rw-r--r--chrome/browser/ui/browser.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index fceb89d..a44067a 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -972,7 +972,15 @@ class Browser : public TabHandlerDelegate,
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
content::NavigationType navigation_type) OVERRIDE;
- virtual void WebContentsCreated(content::WebContents* new_contents) OVERRIDE;
+ virtual bool ShouldCreateWebContents(
+ content::WebContents* web_contents,
+ int route_id,
+ WindowContainerType window_container_type,
+ const string16& frame_name) OVERRIDE;
+ virtual void WebContentsCreated(content::WebContents* source_contents,
+ int64 source_frame_id,
+ const GURL& target_url,
+ content::WebContents* new_contents) OVERRIDE;
virtual void ContentRestrictionsChanged(
content::WebContents* source) OVERRIDE;
virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
@@ -1281,6 +1289,13 @@ class Browser : public TabHandlerDelegate,
// Open the bookmark manager with a defined hash action.
void OpenBookmarkManagerWithHash(const std::string& action, int64 node_id);
+ // Creates a BackgroundContents if appropriate; return true if one was
+ // created.
+ bool MaybeCreateBackgroundContents(int route_id,
+ SiteInstance* site,
+ const GURL& opener_url,
+ const string16& frame_name);
+
// Data members /////////////////////////////////////////////////////////////
content::NotificationRegistrar registrar_;