diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 23:16:10 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 23:16:10 +0000 |
| commit | 67825502bb43b8549b4d50e5ee414ec5be66db9c (patch) | |
| tree | 135811bfc018374abab8dafffe1e30d967d10881 | |
| parent | 8580772c15a5c81eea0fb456a8738ff3277f9908 (diff) | |
| download | chromium_src-67825502bb43b8549b4d50e5ee414ec5be66db9c.zip chromium_src-67825502bb43b8549b4d50e5ee414ec5be66db9c.tar.gz chromium_src-67825502bb43b8549b4d50e5ee414ec5be66db9c.tar.bz2 | |
Fix and reenable DetachedPanelBrowserTest.ClickTitlebar
BUG=143247
TEST=test enabled
Review URL: https://chromiumcodereview.appspot.com/18562002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209809 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/panels/detached_panel_browsertest.cc | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/chrome/browser/ui/panels/detached_panel_browsertest.cc b/chrome/browser/ui/panels/detached_panel_browsertest.cc index f9587eb..4b744dc 100644 --- a/chrome/browser/ui/panels/detached_panel_browsertest.cc +++ b/chrome/browser/ui/panels/detached_panel_browsertest.cc @@ -118,21 +118,12 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DrawAttentionResetOnActivate) { PanelManager::GetInstance()->CloseAll(); } -// http://crbug.com/143247 -#if !defined(OS_WIN) -#define MAYBE_ClickTitlebar DISABLED_ClickTitlebar -#else -#define MAYBE_ClickTitlebar ClickTitlebar -#endif -IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, MAYBE_ClickTitlebar) { - PanelManager* panel_manager = PanelManager::GetInstance(); - +IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, ClickTitlebar) { Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200)); EXPECT_FALSE(panel->IsMinimized()); // Clicking on an active detached panel's titlebar has no effect, regardless // of modifier. - WaitForPanelActiveState(panel, SHOW_AS_ACTIVE); // doublecheck active state scoped_ptr<NativePanelTesting> test_panel( CreateNativePanelTesting(panel)); test_panel->PressLeftMouseButtonTitlebar(panel->GetBounds().origin()); @@ -146,17 +137,14 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, MAYBE_ClickTitlebar) { EXPECT_TRUE(panel->IsActive()); EXPECT_FALSE(panel->IsMinimized()); - // Create a second panel to cause the first to become inactive. - CreateDetachedPanel("2", gfx::Rect(100, 200, 230, 345)); - WaitForPanelActiveState(panel, SHOW_AS_INACTIVE); - // Clicking on an inactive detached panel's titlebar activates it. + DeactivatePanel(panel); test_panel->PressLeftMouseButtonTitlebar(panel->GetBounds().origin()); test_panel->ReleaseMouseButtonTitlebar(); WaitForPanelActiveState(panel, SHOW_AS_ACTIVE); EXPECT_FALSE(panel->IsMinimized()); - panel_manager->CloseAll(); + PanelManager::GetInstance()->CloseAll(); } IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, |