diff options
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/interstitial_page.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.h | 3 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents_view.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents_view.h | 3 |
5 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc index 9384988..e0106aa 100644 --- a/chrome/browser/tab_contents/interstitial_page.cc +++ b/chrome/browser/tab_contents/interstitial_page.cc @@ -76,7 +76,8 @@ class InterstitialPage::InterstitialPageRVHViewDelegate virtual void ShowCreatedWindow(int route_id, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture); + bool user_gesture, + const GURL& creator_url); virtual void ShowCreatedWidget(int route_id, const gfx::Rect& initial_pos); virtual void ShowContextMenu(const ContextMenuParams& params); @@ -473,7 +474,7 @@ void InterstitialPage::InterstitialPageRVHViewDelegate::CreateNewWidget( void InterstitialPage::InterstitialPageRVHViewDelegate::ShowCreatedWindow( int route_id, WindowOpenDisposition disposition, - const gfx::Rect& initial_pos, bool user_gesture) { + const gfx::Rect& initial_pos, bool user_gesture, const GURL& creator_url) { NOTREACHED() << "InterstitialPage does not support showing popups yet."; } diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 3712fc4..92d5584 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -774,7 +774,8 @@ ConstrainedWindow* TabContents::CreateConstrainedDialog( void TabContents::AddNewContents(TabContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture) { + bool user_gesture, + const GURL& creator_url) { if (!delegate_) return; diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 0497fdd..cb7e589 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -332,7 +332,8 @@ class TabContents : public PageNavigator, void AddNewContents(TabContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture); + bool user_gesture, + const GURL& creator_url); // Builds a ConstrainedWindow* for the incoming |new_contents| and // adds it to child_windows_. diff --git a/chrome/browser/tab_contents/tab_contents_view.cc b/chrome/browser/tab_contents/tab_contents_view.cc index da6c894..402876d 100644 --- a/chrome/browser/tab_contents/tab_contents_view.cc +++ b/chrome/browser/tab_contents/tab_contents_view.cc @@ -35,11 +35,12 @@ void TabContentsView::CreateNewWidget(int route_id, bool activatable) { void TabContentsView::ShowCreatedWindow(int route_id, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture) { + bool user_gesture, + const GURL& creator_url) { TabContents* contents = delegate_view_helper_.GetCreatedWindow(route_id); if (contents) { tab_contents()->AddNewContents(contents, disposition, initial_pos, - user_gesture); + user_gesture, creator_url); } } @@ -65,4 +66,3 @@ void TabContentsView::ShowCreatedWidgetInternal( initial_pos); widget_host_view->GetRenderWidgetHost()->Init(); } - diff --git a/chrome/browser/tab_contents/tab_contents_view.h b/chrome/browser/tab_contents/tab_contents_view.h index 1887f13..2af4902 100644 --- a/chrome/browser/tab_contents/tab_contents_view.h +++ b/chrome/browser/tab_contents/tab_contents_view.h @@ -154,7 +154,8 @@ class TabContentsView : public RenderViewHostDelegate::View { virtual void ShowCreatedWindow(int route_id, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture); + bool user_gesture, + const GURL& creator_url); virtual void ShowCreatedWidget(int route_id, const gfx::Rect& initial_pos); // The TabContents whose contents we display. |