summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/interstitial_page.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 00:56:32 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 00:56:32 +0000
commitdcbfa96ce5fdecd4c0504c167ff576e9adb51df6 (patch)
tree44c01c21b39638def0987d6abcdc8eae52193850 /chrome/browser/tab_contents/interstitial_page.cc
parente329b6e6ce31f4f129d335c0d2ca4411ac85431f (diff)
downloadchromium_src-dcbfa96ce5fdecd4c0504c167ff576e9adb51df6.zip
chromium_src-dcbfa96ce5fdecd4c0504c167ff576e9adb51df6.tar.gz
chromium_src-dcbfa96ce5fdecd4c0504c167ff576e9adb51df6.tar.bz2
Merge 37143 - Associate popups with the top level frame instead of the security origin.
Associate popups with the top level frame instead of the security origin. No longer send the creator from the renderer to the browser since this was all it was used for. BUG=none TEST=none Review URL: http://codereview.chromium.org/543199 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/553107 git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@37192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/interstitial_page.cc')
-rw-r--r--chrome/browser/tab_contents/interstitial_page.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc
index 34e008c..46edb38 100644
--- a/chrome/browser/tab_contents/interstitial_page.cc
+++ b/chrome/browser/tab_contents/interstitial_page.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -87,8 +87,7 @@ class InterstitialPage::InterstitialPageRVHViewDelegate
virtual void ShowCreatedWindow(int route_id,
WindowOpenDisposition disposition,
const gfx::Rect& initial_pos,
- bool user_gesture,
- const GURL& creator_url);
+ bool user_gesture);
virtual void ShowCreatedWidget(int route_id,
const gfx::Rect& initial_pos);
virtual void ShowContextMenu(const ContextMenuParams& params);
@@ -542,7 +541,7 @@ void InterstitialPage::InterstitialPageRVHViewDelegate::CreateNewWidget(
void InterstitialPage::InterstitialPageRVHViewDelegate::ShowCreatedWindow(
int route_id, WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos, bool user_gesture, const GURL& creator_url) {
+ const gfx::Rect& initial_pos, bool user_gesture) {
NOTREACHED() << "InterstitialPage does not support showing popups yet.";
}