diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 00:19:59 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 00:19:59 +0000 |
commit | 8b6384271101aa16e3764ba0c927426e7966ea91 (patch) | |
tree | 8402b201190fdd2cb1074de95dd1ab9b3c51fc4a /chrome/browser/browser.cc | |
parent | 3dca25ec097f4fb340df49d38ca1ff85805603aa (diff) | |
download | chromium_src-8b6384271101aa16e3764ba0c927426e7966ea91.zip chromium_src-8b6384271101aa16e3764ba0c927426e7966ea91.tar.gz chromium_src-8b6384271101aa16e3764ba0c927426e7966ea91.tar.bz2 |
Redo how we block popups. Rip out the old constrained popup window cruft (while leaving the HTTP authentication dialog support) and add a new type of constrained window which owns all blocked popups. Rip out dead unit tests.
Review URL: http://codereview.chromium.org/8782
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r-- | chrome/browser/browser.cc | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index dcb7082..016b43b 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -732,42 +732,6 @@ void Browser::AddNewContents(TabContents* source, } } -void Browser::StartDraggingDetachedContents(TabContents* source, - TabContents* new_contents, - const gfx::Rect& contents_bounds, - const gfx::Point& mouse_pt, - int frame_component) { - if (!g_browser_process->IsUsingNewFrames()) { - BrowserType::Type new_type = BrowserType::BROWSER; - - // If this is a minimal chrome browser, propagate to detached contents to - // avoid having URL fields in popups. - if (type_ == BrowserType::APPLICATION) - new_type = type_; - - Browser* browser = new Browser(contents_bounds, SIZE_TO_CONTENTS, profile_, - new_type, L""); - browser->AddNewContents( - source, new_contents, NEW_FOREGROUND_TAB, contents_bounds, true); - browser->Show(); - browser->window_->ContinueDetachConstrainedWindowDrag( - mouse_pt, frame_component); - } else { - // If we're inside an application frame, preserve that type (i.e. don't - // show a location bar on the new window), otherwise open a tab-less - // browser window with a location bar. - BrowserType::Type new_type = - type_ == BrowserType::APPLICATION ? type_ : BrowserType::BROWSER; - Browser* browser = new Browser(contents_bounds, SW_SHOWNORMAL, profile_, - BrowserType::BROWSER, std::wstring()); - browser->AddNewContents(source, new_contents, - NEW_FOREGROUND_TAB, gfx::Rect(), true); - browser->Show(); - browser->window()->ContinueDetachConstrainedWindowDrag(mouse_pt, - frame_component); - } -} - void Browser::ActivateContents(TabContents* contents) { tabstrip_model_.SelectTabContentsAt( tabstrip_model_.GetIndexOfTabContents(contents), false); @@ -1877,4 +1841,3 @@ void Browser::FormatTitleForDisplay(std::wstring* title) { current_index = match_index; } } - |