Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5495)

Unified Diff: chrome/browser/ui/panels/panel_browser_view_browsertest.cc

Issue 8341098: Mac: Added a delay before panels go to minimized state from title-only state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more feedback Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_browser_view_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc
index 9ca07cff18a2d4c2fd615aef21c98c58c054d59e..2c32163d7c1a13f3162aad56769d3a58e5217c81 100644
--- a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc
@@ -241,23 +241,37 @@ class PanelBrowserViewTest : public BasePanelBrowserTest {
EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
EXPECT_EQ(2, panel_manager->minimized_panel_count());
- mock_auto_hiding_desktop_bar()->SetVisibility(
- AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::VISIBLE);
- panel_manager->BringUpOrDownTitlebars(true);
- MessageLoopForUI::current()->RunAllPending();
- EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
- EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
- EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state());
- EXPECT_EQ(2, panel_manager->minimized_panel_count());
+ {
+ mock_auto_hiding_desktop_bar()->SetVisibility(
+ AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::VISIBLE);
+
+ ui_test_utils::WindowedNotificationObserver signal(
+ chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
+ content::Source<Panel>(panel1));
+ panel_manager->BringUpOrDownTitlebars(true);
+ signal.Wait();
+
+ EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
+ EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
+ EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state());
+ EXPECT_EQ(2, panel_manager->minimized_panel_count());
+ }
- mock_auto_hiding_desktop_bar()->SetVisibility(
- AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::HIDDEN);
- panel_manager->BringUpOrDownTitlebars(false);
- MessageLoopForUI::current()->RunAllPending();
- EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
- EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
- EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
- EXPECT_EQ(2, panel_manager->minimized_panel_count());
+ {
+ mock_auto_hiding_desktop_bar()->SetVisibility(
+ AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::HIDDEN);
+
+ ui_test_utils::WindowedNotificationObserver signal(
+ chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
+ content::Source<Panel>(panel1));
+ panel_manager->BringUpOrDownTitlebars(false);
+ signal.Wait();
+
+ EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
+ EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
+ EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
+ EXPECT_EQ(2, panel_manager->minimized_panel_count());
+ }
// Test if it is OK to bring up title-bar given the mouse position.
EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars(

Powered by Google App Engine
This is Rietveld 408576698