diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-04 21:52:48 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-04 21:52:48 +0000 |
| commit | 7e50312540228f37a95ecff34c9fba6ba3699889 (patch) | |
| tree | 34c2617652b916c2b77ef338654da6754031b77d /chrome | |
| parent | 5fac9623175cb7bda27ccc079ea19b3f90471149 (diff) | |
| download | chromium_src-7e50312540228f37a95ecff34c9fba6ba3699889.zip chromium_src-7e50312540228f37a95ecff34c9fba6ba3699889.tar.gz chromium_src-7e50312540228f37a95ecff34c9fba6ba3699889.tar.bz2 | |
Explicitly removing WS_POPUP after initialization so that users of the ExternalTabContainer class can control whether or not it's set.
Review URL: http://codereview.chromium.org/19768
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/external_tab_container.cc | 6 | ||||
| -rw-r--r-- | chrome/test/automation/automation_proxy_uitest.cc | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index 9527e97..e80a01b 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -93,7 +93,11 @@ bool ExternalTabContainer::Init(Profile* profile, HWND parent, // Now apply the parenting and style if (parent) SetParent(parent); - ModifyStyle(0, style, 0); + + // We need WS_POPUP to be on the window during initialization, but + // once initialized and parent-ed, we apply the requested style which + // may or may not include the popup bit. + ModifyStyle(WS_POPUP, style, 0); ::ShowWindow(tab_contents_->GetContainerHWND(), SW_SHOW); return true; diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index 212100a..acdf819 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -749,7 +749,7 @@ bool ExternalTabHandler(HWND external_tab_window) { TEST_F(AutomationProxyVisibleTest, CreateExternalTab) { HWND external_tab_container = NULL; scoped_ptr<TabProxy> tab(automation()->CreateExternalTab( - NULL, gfx::Rect(), 0, &external_tab_container)); + NULL, gfx::Rect(), WS_POPUP, &external_tab_container)); EXPECT_TRUE(tab != NULL); EXPECT_NE(FALSE, ::IsWindow(external_tab_container)); if (tab != NULL) { |