| OLD | NEW |
| 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" |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 238 |
| 239 // 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. |
| 240 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); | 240 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); |
| 241 panel3->SetExpansionState(Panel::MINIMIZED); | 241 panel3->SetExpansionState(Panel::MINIMIZED); |
| 242 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state()); | 242 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state()); |
| 243 EXPECT_EQ(2, panel_manager->minimized_panel_count()); | 243 EXPECT_EQ(2, panel_manager->minimized_panel_count()); |
| 244 | 244 |
| 245 // TODO(dimich): Either remove this test in favor of platform-independent | 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 | 246 // one, or fix it. It is broken because are_titlebars_up_ in PanelManager |
| 247 // is not in sync with requested state of titlebars. | 247 // is not in sync with requested state of titlebars. |
| 248 // http://crbug.com/102733 |
| 248 /* | 249 /* |
| 249 mock_auto_hiding_desktop_bar()->SetVisibility( | 250 mock_auto_hiding_desktop_bar()->SetVisibility( |
| 250 AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::VISIBLE); | 251 AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::VISIBLE); |
| 251 panel_manager->BringUpOrDownTitlebars(true); | 252 panel_manager->BringUpOrDownTitlebars(true); |
| 252 MessageLoopForUI::current()->RunAllPending(); | 253 MessageLoopForUI::current()->RunAllPending(); |
| 253 EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state()); | 254 EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state()); |
| 254 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); | 255 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); |
| 255 EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state()); | 256 EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state()); |
| 256 EXPECT_EQ(2, panel_manager->minimized_panel_count()); | 257 EXPECT_EQ(2, panel_manager->minimized_panel_count()); |
| 257 | 258 |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 578 MinimizeAndRestoreOnNormalTaskBar) { | 579 MinimizeAndRestoreOnNormalTaskBar) { |
| 579 TestMinimizeAndRestore(false); | 580 TestMinimizeAndRestore(false); |
| 580 } | 581 } |
| 581 | 582 |
| 582 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, | 583 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, |
| 583 MinimizeAndRestoreOnAutoHideTaskBar) { | 584 MinimizeAndRestoreOnAutoHideTaskBar) { |
| 584 TestMinimizeAndRestore(true); | 585 TestMinimizeAndRestore(true); |
| 585 } | 586 } |
| 586 | 587 |
| 587 // TODO(jianli): Investigate why this fails on win trunk build. | 588 // TODO(jianli): Investigate why this fails on win trunk build. |
| 589 // http://crbug.com/102734 |
| 588 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, DISABLED_DrawAttention) { | 590 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, DISABLED_DrawAttention) { |
| 589 TestDrawAttention(); | 591 TestDrawAttention(); |
| 590 } | 592 } |
| 591 | 593 |
| 592 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, ChangeAutoHideTaskBarThickness) { | 594 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, ChangeAutoHideTaskBarThickness) { |
| 593 TestChangeAutoHideTaskBarThickness(); | 595 TestChangeAutoHideTaskBarThickness(); |
| 594 } | 596 } |
| 595 #endif | 597 #endif |
| OLD | NEW |