diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 20:19:29 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 20:19:29 +0000 |
commit | 7e7414aeab90afaeeb7b29cfde1ce19d90529a37 (patch) | |
tree | 4d3d5176a7c90204ae336753fef127dff1ce380f /chrome/browser/chromeos/main_menu.cc | |
parent | 62299d40f271bfaae651f8dcfea4da8170a7bc14 (diff) | |
download | chromium_src-7e7414aeab90afaeeb7b29cfde1ce19d90529a37.zip chromium_src-7e7414aeab90afaeeb7b29cfde1ce19d90529a37.tar.gz chromium_src-7e7414aeab90afaeeb7b29cfde1ce19d90529a37.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/main_menu.cc')
-rw-r--r-- | chrome/browser/chromeos/main_menu.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/main_menu.cc b/chrome/browser/chromeos/main_menu.cc index eae51c9..452f412 100644 --- a/chrome/browser/chromeos/main_menu.cc +++ b/chrome/browser/chromeos/main_menu.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -271,13 +271,11 @@ void MainMenu::CreateNewWindow(int route_id) { void MainMenu::ShowCreatedWindow(int route_id, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture, - const GURL& creator_url) { + bool user_gesture) { if (disposition == NEW_POPUP) { pending_contents_->set_delegate(NULL); browser_->GetSelectedTabContents()->AddNewContents( - pending_contents_.release(), disposition, initial_pos, user_gesture, - creator_url); + pending_contents_.release(), disposition, initial_pos, user_gesture); Hide(); } } |