diff options
author | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 20:33:11 +0000 |
---|---|---|
committer | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 20:33:11 +0000 |
commit | fed9d32f572333446448158c80e269d87523360e (patch) | |
tree | ae2da933457a2094fc5d3b8515c8f1e713ce4ca0 /chrome/browser/external_tab_container.cc | |
parent | 2b4053cdcb0962b724e92b14c7a6c25d99350a43 (diff) | |
download | chromium_src-fed9d32f572333446448158c80e269d87523360e.zip chromium_src-fed9d32f572333446448158c80e269d87523360e.tar.gz chromium_src-fed9d32f572333446448158c80e269d87523360e.tar.bz2 |
Avoid DCHECKING on NEW_FOREGROUND_TAB and NEW_BACKGROUND_TAB dispositions in ExternalTabContainer by re-routing those dispositions to new popups.
Review URL: http://codereview.chromium.org/115943
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container.cc')
-rw-r--r-- | chrome/browser/external_tab_container.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index a8490ae..3a24366 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -130,7 +130,7 @@ void ExternalTabContainer::SetInitialFocus(bool reverse) { bool ExternalTabContainer::IsExternalTabContainer(HWND window) { if (GetProp(window, kWindowObjectKey) != NULL) return true; - + return false; } @@ -186,7 +186,8 @@ void ExternalTabContainer::AddNewContents(TabContents* source, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture) { - if (disposition == NEW_POPUP || disposition == NEW_WINDOW) { + if (disposition == NEW_POPUP || disposition == NEW_WINDOW || + disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB) { Browser::BuildPopupWindowHelper(source, new_contents, initial_pos, Browser::TYPE_POPUP, tab_contents_->profile(), true); @@ -235,7 +236,7 @@ void ExternalTabContainer::ToolbarSizeChanged(TabContents* source, void ExternalTabContainer::ForwardMessageToExternalHost( const std::string& message, const std::string& origin, const std::string& target) { - if(automation_) { + if (automation_) { automation_->Send( new AutomationMsg_ForwardMessageToExternalHost(0, tab_handle_, message, origin, target)); |