diff options
| author | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-01 18:11:39 +0000 |
|---|---|---|
| committer | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-01 18:11:39 +0000 |
| commit | 0dd5777b717438bea6005fe109137cd42db169c4 (patch) | |
| tree | 733935519f674a4107b3d4d57ca45a5115d324a3 | |
| parent | e3761b7d6df630766645ee1acb22dbff2c197ae0 (diff) | |
| download | chromium_src-0dd5777b717438bea6005fe109137cd42db169c4.zip chromium_src-0dd5777b717438bea6005fe109137cd42db169c4.tar.gz chromium_src-0dd5777b717438bea6005fe109137cd42db169c4.tar.bz2 | |
Rollin' back 17315. Looks to be breaking OpenPopupWindowWithPlugin in the UI Test on the builder.
TBR=jhawkins
Review URL: http://codereview.chromium.org/115997
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17332 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/external_tab_container.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index 3a24366..a8490ae 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,8 +186,7 @@ void ExternalTabContainer::AddNewContents(TabContents* source, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture) { - if (disposition == NEW_POPUP || disposition == NEW_WINDOW || - disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB) { + if (disposition == NEW_POPUP || disposition == NEW_WINDOW) { Browser::BuildPopupWindowHelper(source, new_contents, initial_pos, Browser::TYPE_POPUP, tab_contents_->profile(), true); @@ -236,7 +235,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)); |