Chromium Code Reviews| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/i18n/time_formatting.h" | 6 #include "base/i18n/time_formatting.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.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 270 PanelBrowserView* browser_view2 = CreatePanelBrowserView("PanelTest2", | 270 PanelBrowserView* browser_view2 = CreatePanelBrowserView("PanelTest2", |
| 271 SHOW_AS_INACTIVE); | 271 SHOW_AS_INACTIVE); |
| 272 PanelBrowserFrameView* frame_view2 = browser_view2->GetFrameView(); | 272 PanelBrowserFrameView* frame_view2 = browser_view2->GetFrameView(); |
| 273 EXPECT_FALSE(browser_view2->panel()->IsActive()); | 273 EXPECT_FALSE(browser_view2->panel()->IsActive()); |
| 274 EXPECT_EQ(PanelBrowserFrameView::PAINT_AS_INACTIVE, | 274 EXPECT_EQ(PanelBrowserFrameView::PAINT_AS_INACTIVE, |
| 275 frame_view2->paint_state_); | 275 frame_view2->paint_state_); |
| 276 | 276 |
| 277 browser_view1->panel()->Close(); | 277 browser_view1->panel()->Close(); |
| 278 browser_view2->panel()->Close(); | 278 browser_view2->panel()->Close(); |
| 279 } | 279 } |
| 280 | |
| 281 // We put all the testing logic in this class instead of the test so that | |
| 282 // we do not need to declare each new test as a friend of PanelBrowserView | |
| 283 // for the purpose of accessing its private members. | |
| 284 void TestMinimizeAndRestore() { | |
| 285 PanelBrowserView* browser_view = CreatePanelBrowserView("PanelTest", | |
| 286 SHOW_AS_ACTIVE); | |
| 287 Panel* panel = browser_view->panel_.get(); | |
| 288 | |
| 289 EXPECT_EQ(Panel::EXPANDED, panel->expansion_state()); | |
| 290 int initial_height = panel->GetBounds().height(); | |
| 291 int titlebar_height = | |
| 292 browser_view->GetFrameView()->NonClientTopBorderHeight(); | |
| 293 | |
| 294 browser_view->SetPanelExpansionState(Panel::MINIMIZED); | |
|
jennb
2011/06/29 23:17:54
Should this be panel->SetPanelExpansionState()?
jianli
2011/06/30 01:28:33
Done.
| |
| 295 EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state()); | |
| 296 EXPECT_LT(panel->GetBounds().height(), titlebar_height); | |
| 297 EXPECT_GT(panel->GetBounds().height(), 0); | |
| 298 | |
| 299 browser_view->SetPanelExpansionState(Panel::TITLE_ONLY); | |
| 300 EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state()); | |
| 301 EXPECT_EQ(titlebar_height, panel->GetBounds().height()); | |
| 302 | |
| 303 browser_view->SetPanelExpansionState(Panel::EXPANDED); | |
| 304 EXPECT_EQ(Panel::EXPANDED, panel->expansion_state()); | |
| 305 EXPECT_EQ(initial_height, panel->GetBounds().height()); | |
| 306 | |
| 307 browser_view->SetPanelExpansionState(Panel::TITLE_ONLY); | |
| 308 EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state()); | |
| 309 EXPECT_EQ(initial_height, panel->GetBounds().height()); | |
| 310 | |
| 311 browser_view->SetPanelExpansionState(Panel::MINIMIZED); | |
| 312 EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state()); | |
| 313 EXPECT_LT(panel->GetBounds().height(), titlebar_height); | |
| 314 EXPECT_GT(panel->GetBounds().height(), 0); | |
| 315 | |
| 316 browser_view->panel()->Close(); | |
| 317 } | |
| 280 }; | 318 }; |
| 281 | 319 |
| 282 // Panel is not supported for Linux view yet. | 320 // Panel is not supported for Linux view yet. |
| 283 #if !defined(OS_LINUX) || !defined(TOOLKIT_VIEWS) | 321 #if !defined(OS_LINUX) || !defined(TOOLKIT_VIEWS) |
| 284 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, CreatePanel) { | 322 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, CreatePanel) { |
| 285 PanelBrowserView* browser_view = CreatePanelBrowserView("PanelTest", | 323 PanelBrowserView* browser_view = CreatePanelBrowserView("PanelTest", |
| 286 SHOW_AS_ACTIVE); | 324 SHOW_AS_ACTIVE); |
| 287 PanelBrowserFrameView* frame_view = browser_view->GetFrameView(); | 325 PanelBrowserFrameView* frame_view = browser_view->GetFrameView(); |
| 288 | 326 |
| 289 // The bounds animation should not be triggered when the panel is up for the | 327 // The bounds animation should not be triggered when the panel is up for the |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 580 } | 618 } |
| 581 | 619 |
| 582 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, CreateSettingsMenu) { | 620 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, CreateSettingsMenu) { |
| 583 TestCreateSettingsMenuForExtension( | 621 TestCreateSettingsMenuForExtension( |
| 584 FILE_PATH_LITERAL("extension1"), Extension::EXTERNAL_POLICY_DOWNLOAD, | 622 FILE_PATH_LITERAL("extension1"), Extension::EXTERNAL_POLICY_DOWNLOAD, |
| 585 "", ""); | 623 "", ""); |
| 586 TestCreateSettingsMenuForExtension( | 624 TestCreateSettingsMenuForExtension( |
| 587 FILE_PATH_LITERAL("extension2"), Extension::INVALID, | 625 FILE_PATH_LITERAL("extension2"), Extension::INVALID, |
| 588 "http://home", "options.html"); | 626 "http://home", "options.html"); |
| 589 } | 627 } |
| 628 | |
| 629 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, MinimizeAndRestore) { | |
| 630 TestMinimizeAndRestore(); | |
| 631 } | |
| 590 #endif | 632 #endif |
| OLD | NEW |