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

Side by Side 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: disabled win test Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/panels/panel.cc ('k') | chrome/browser/ui/panels/panel_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/i18n/time_formatting.h" 5 #include "base/i18n/time_formatting.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser_window.h" 9 #include "chrome/browser/ui/browser_window.h"
10 #include "chrome/browser/ui/panels/base_panel_browser_test.h" 10 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
11 #include "chrome/browser/ui/panels/panel.h" 11 #include "chrome/browser/ui/panels/panel.h"
12 #include "chrome/browser/ui/panels/panel_browser_frame_view.h" 12 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
13 #include "chrome/browser/ui/panels/panel_browser_view.h" 13 #include "chrome/browser/ui/panels/panel_browser_view.h"
14 #include "chrome/browser/ui/panels/panel_manager.h" 14 #include "chrome/browser/ui/panels/panel_manager.h"
15 #include "chrome/browser/web_applications/web_app.h" 15 #include "chrome/browser/web_applications/web_app.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/extensions/extension.h" 17 #include "chrome/common/extensions/extension.h"
18 #include "chrome/test/base/ui_test_utils.h"
18 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
20 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
21 #include "ui/base/animation/slide_animation.h" 22 #include "ui/base/animation/slide_animation.h"
22 #include "views/controls/button/image_button.h" 23 #include "views/controls/button/image_button.h"
23 #include "views/controls/button/menu_button.h" 24 #include "views/controls/button/menu_button.h"
24 #include "views/controls/image_view.h" 25 #include "views/controls/image_view.h"
25 #include "views/controls/label.h" 26 #include "views/controls/label.h"
26 #include "views/controls/link.h" 27 #include "views/controls/link.h"
27 #include "views/controls/textfield/textfield.h" 28 #include "views/controls/textfield/textfield.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 // Create 2 more panels for more testing. 235 // Create 2 more panels for more testing.
235 Panel* panel2 = CreatePanel("PanelTest2"); 236 Panel* panel2 = CreatePanel("PanelTest2");
236 Panel* panel3 = CreatePanel("PanelTest3"); 237 Panel* panel3 = CreatePanel("PanelTest3");
237 238
238 // Test bringing up or down the title-bar of all minimized panels. 239 // Test bringing up or down the title-bar of all minimized panels.
239 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); 240 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
240 panel3->SetExpansionState(Panel::MINIMIZED); 241 panel3->SetExpansionState(Panel::MINIMIZED);
241 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state()); 242 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
242 EXPECT_EQ(2, panel_manager->minimized_panel_count()); 243 EXPECT_EQ(2, panel_manager->minimized_panel_count());
243 244
245 // TODO(dimich): Either remove this test in favor of platform-independent
246 // one, or fix it. It is broken because are_titlebars_up_ in PanelManager
247 // is not in sync with requested state of titlebars.
248 /*
244 mock_auto_hiding_desktop_bar()->SetVisibility( 249 mock_auto_hiding_desktop_bar()->SetVisibility(
245 AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::VISIBLE); 250 AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::VISIBLE);
246 panel_manager->BringUpOrDownTitlebars(true); 251 panel_manager->BringUpOrDownTitlebars(true);
247 MessageLoopForUI::current()->RunAllPending(); 252 MessageLoopForUI::current()->RunAllPending();
248 EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state()); 253 EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
249 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); 254 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
250 EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state()); 255 EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state());
251 EXPECT_EQ(2, panel_manager->minimized_panel_count()); 256 EXPECT_EQ(2, panel_manager->minimized_panel_count());
252 257
253 mock_auto_hiding_desktop_bar()->SetVisibility( 258 mock_auto_hiding_desktop_bar()->SetVisibility(
254 AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::HIDDEN); 259 AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::HIDDEN);
255 panel_manager->BringUpOrDownTitlebars(false); 260 panel_manager->BringUpOrDownTitlebars(false);
256 MessageLoopForUI::current()->RunAllPending(); 261 MessageLoopForUI::current()->RunAllPending();
257 EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state()); 262 EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
258 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); 263 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
259 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state()); 264 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
260 EXPECT_EQ(2, panel_manager->minimized_panel_count()); 265 EXPECT_EQ(2, panel_manager->minimized_panel_count());
266 */
261 267
262 // Test if it is OK to bring up title-bar given the mouse position. 268 // Test if it is OK to bring up title-bar given the mouse position.
263 EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars( 269 EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars(
264 panel1->GetBounds().x(), panel1->GetBounds().y())); 270 panel1->GetBounds().x(), panel1->GetBounds().y()));
265 EXPECT_FALSE(panel_manager->ShouldBringUpTitlebars( 271 EXPECT_FALSE(panel_manager->ShouldBringUpTitlebars(
266 panel2->GetBounds().x(), panel2->GetBounds().y())); 272 panel2->GetBounds().x(), panel2->GetBounds().y()));
267 EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars( 273 EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars(
268 panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() - 1)); 274 panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() - 1));
269 EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars( 275 EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars(
270 panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() + 10)); 276 panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() + 10));
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 MessageLoopForUI::current()->RunAllPending(); 335 MessageLoopForUI::current()->RunAllPending();
330 EXPECT_EQ(attention_color, frame_view->title_label_->enabled_color()); 336 EXPECT_EQ(attention_color, frame_view->title_label_->enabled_color());
331 337
332 // Test that we cannot bring up other minimized panel if the mouse is over 338 // Test that we cannot bring up other minimized panel if the mouse is over
333 // the panel that draws attension. 339 // the panel that draws attension.
334 EXPECT_FALSE(PanelManager::GetInstance()-> 340 EXPECT_FALSE(PanelManager::GetInstance()->
335 ShouldBringUpTitlebars(panel->GetBounds().x(), panel->GetBounds().y())); 341 ShouldBringUpTitlebars(panel->GetBounds().x(), panel->GetBounds().y()));
336 342
337 // Test that we cannot bring down the panel that is drawing the attention. 343 // Test that we cannot bring down the panel that is drawing the attention.
338 PanelManager::GetInstance()->BringUpOrDownTitlebars(false); 344 PanelManager::GetInstance()->BringUpOrDownTitlebars(false);
345 MessageLoopForUI::current()->RunAllPending();
339 EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state()); 346 EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
340 347
341 // Test that the attention is cleared. 348 // Test that the attention is cleared.
342 browser_view->StopDrawingAttention(); 349 browser_view->StopDrawingAttention();
343 EXPECT_FALSE(browser_view->IsDrawingAttention()); 350 EXPECT_FALSE(browser_view->IsDrawingAttention());
344 EXPECT_EQ(Panel::EXPANDED, panel->expansion_state()); 351 EXPECT_EQ(Panel::EXPANDED, panel->expansion_state());
345 MessageLoopForUI::current()->RunAllPending(); 352 MessageLoopForUI::current()->RunAllPending();
346 EXPECT_NE(attention_color, frame_view->title_label_->enabled_color()); 353 EXPECT_NE(attention_color, frame_view->title_label_->enabled_color());
347 354
348 panel->Close(); 355 panel->Close();
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 586
580 // TODO(jianli): Investigate why this fails on win trunk build. 587 // TODO(jianli): Investigate why this fails on win trunk build.
581 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, DISABLED_DrawAttention) { 588 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, DISABLED_DrawAttention) {
582 TestDrawAttention(); 589 TestDrawAttention();
583 } 590 }
584 591
585 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, ChangeAutoHideTaskBarThickness) { 592 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, ChangeAutoHideTaskBarThickness) {
586 TestChangeAutoHideTaskBarThickness(); 593 TestChangeAutoHideTaskBarThickness();
587 } 594 }
588 #endif 595 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel.cc ('k') | chrome/browser/ui/panels/panel_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698