| 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 SHOW_AS_ACTIVE); | 259 SHOW_AS_ACTIVE); |
| 260 Panel* panel3 = browser_view3->panel_.get(); | 260 Panel* panel3 = browser_view3->panel_.get(); |
| 261 | 261 |
| 262 // Test bringing up or down the title-bar of all minimized panels. | 262 // Test bringing up or down the title-bar of all minimized panels. |
| 263 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); | 263 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); |
| 264 panel3->SetExpansionState(Panel::MINIMIZED); | 264 panel3->SetExpansionState(Panel::MINIMIZED); |
| 265 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state()); | 265 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state()); |
| 266 | 266 |
| 267 PanelManager* panel_manager = PanelManager::GetInstance(); | 267 PanelManager* panel_manager = PanelManager::GetInstance(); |
| 268 | 268 |
| 269 panel_manager->BringUpOrDownTitleBarForAllMinimizedPanels(true); | 269 panel_manager->BringUpOrDownTitlebarForAllMinimizedPanels(true); |
| 270 EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state()); | 270 EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state()); |
| 271 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); | 271 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); |
| 272 EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state()); | 272 EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state()); |
| 273 | 273 |
| 274 panel_manager->BringUpOrDownTitleBarForAllMinimizedPanels(false); | 274 panel_manager->BringUpOrDownTitlebarForAllMinimizedPanels(false); |
| 275 EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state()); | 275 EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state()); |
| 276 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); | 276 EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state()); |
| 277 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state()); | 277 EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state()); |
| 278 | 278 |
| 279 // Test if it is OK to bring up title-bar given the mouse position. | 279 // Test if it is OK to bring up title-bar given the mouse position. |
| 280 EXPECT_TRUE(panel_manager->ShouldBringUpTitleBarForAllMinimizedPanels( | 280 EXPECT_TRUE(panel_manager->ShouldBringUpTitlebarForAllMinimizedPanels( |
| 281 panel1->GetBounds().x(), panel1->GetBounds().y())); | 281 panel1->GetBounds().x(), panel1->GetBounds().y())); |
| 282 EXPECT_FALSE(panel_manager->ShouldBringUpTitleBarForAllMinimizedPanels( | 282 EXPECT_FALSE(panel_manager->ShouldBringUpTitlebarForAllMinimizedPanels( |
| 283 panel2->GetBounds().x(), panel2->GetBounds().y())); | 283 panel2->GetBounds().x(), panel2->GetBounds().y())); |
| 284 EXPECT_TRUE(panel_manager->ShouldBringUpTitleBarForAllMinimizedPanels( | 284 EXPECT_TRUE(panel_manager->ShouldBringUpTitlebarForAllMinimizedPanels( |
| 285 panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() - 1)); | 285 panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() - 1)); |
| 286 EXPECT_TRUE(panel_manager->ShouldBringUpTitleBarForAllMinimizedPanels( | 286 EXPECT_TRUE(panel_manager->ShouldBringUpTitlebarForAllMinimizedPanels( |
| 287 panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() + 10)); | 287 panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() + 10)); |
| 288 EXPECT_FALSE(panel_manager->ShouldBringUpTitleBarForAllMinimizedPanels( | 288 EXPECT_FALSE(panel_manager->ShouldBringUpTitlebarForAllMinimizedPanels( |
| 289 0, 0)); | 289 0, 0)); |
| 290 | 290 |
| 291 panel1->Close(); | 291 panel1->Close(); |
| 292 EXPECT_TRUE(IsMouseWatcherStarted()); | 292 EXPECT_TRUE(IsMouseWatcherStarted()); |
| 293 panel2->Close(); | 293 panel2->Close(); |
| 294 EXPECT_TRUE(IsMouseWatcherStarted()); | 294 EXPECT_TRUE(IsMouseWatcherStarted()); |
| 295 panel3->Close(); | 295 panel3->Close(); |
| 296 EXPECT_FALSE(IsMouseWatcherStarted()); | 296 EXPECT_FALSE(IsMouseWatcherStarted()); |
| 297 } | 297 } |
| 298 | 298 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state()); | 331 EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state()); |
| 332 browser_view->DrawAttention(); | 332 browser_view->DrawAttention(); |
| 333 EXPECT_TRUE(browser_view->IsDrawingAttention()); | 333 EXPECT_TRUE(browser_view->IsDrawingAttention()); |
| 334 EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state()); | 334 EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state()); |
| 335 MessageLoop::current()->RunAllPending(); | 335 MessageLoop::current()->RunAllPending(); |
| 336 EXPECT_EQ(attention_color, frame_view->title_label_->GetColor()); | 336 EXPECT_EQ(attention_color, frame_view->title_label_->GetColor()); |
| 337 | 337 |
| 338 // 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 |
| 339 // the panel that draws attension. | 339 // the panel that draws attension. |
| 340 EXPECT_FALSE(PanelManager::GetInstance()-> | 340 EXPECT_FALSE(PanelManager::GetInstance()-> |
| 341 ShouldBringUpTitleBarForAllMinimizedPanels( | 341 ShouldBringUpTitlebarForAllMinimizedPanels( |
| 342 panel->GetBounds().x(), panel->GetBounds().y())); | 342 panel->GetBounds().x(), panel->GetBounds().y())); |
| 343 | 343 |
| 344 // Test that we cannot bring down the panel that is drawing the attention. | 344 // Test that we cannot bring down the panel that is drawing the attention. |
| 345 PanelManager::GetInstance()->BringUpOrDownTitleBarForAllMinimizedPanels( | 345 PanelManager::GetInstance()->BringUpOrDownTitlebarForAllMinimizedPanels( |
| 346 false); | 346 false); |
| 347 EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state()); | 347 EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state()); |
| 348 | 348 |
| 349 // Test that the attention is cleared. | 349 // Test that the attention is cleared. |
| 350 browser_view->StopDrawingAttention(); | 350 browser_view->StopDrawingAttention(); |
| 351 EXPECT_FALSE(browser_view->IsDrawingAttention()); | 351 EXPECT_FALSE(browser_view->IsDrawingAttention()); |
| 352 EXPECT_EQ(Panel::EXPANDED, panel->expansion_state()); | 352 EXPECT_EQ(Panel::EXPANDED, panel->expansion_state()); |
| 353 MessageLoop::current()->RunAllPending(); | 353 MessageLoop::current()->RunAllPending(); |
| 354 EXPECT_NE(attention_color, frame_view->title_label_->GetColor()); | 354 EXPECT_NE(attention_color, frame_view->title_label_->GetColor()); |
| 355 | 355 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 target_bounds.set_height(target_bounds.height() + 50); | 461 target_bounds.set_height(target_bounds.height() + 50); |
| 462 browser_view->SetBounds(target_bounds); | 462 browser_view->SetBounds(target_bounds); |
| 463 ASSERT_TRUE(browser_view->bounds_animator_.get()); | 463 ASSERT_TRUE(browser_view->bounds_animator_.get()); |
| 464 EXPECT_TRUE(browser_view->bounds_animator_->is_animating()); | 464 EXPECT_TRUE(browser_view->bounds_animator_->is_animating()); |
| 465 EXPECT_NE(browser_view->GetBounds(), target_bounds); | 465 EXPECT_NE(browser_view->GetBounds(), target_bounds); |
| 466 WaitTillBoundsAnimationFinished(browser_view); | 466 WaitTillBoundsAnimationFinished(browser_view); |
| 467 EXPECT_EQ(browser_view->GetBounds(), target_bounds); | 467 EXPECT_EQ(browser_view->GetBounds(), target_bounds); |
| 468 | 468 |
| 469 // Validates that no animation should be triggered for the panel currently | 469 // Validates that no animation should be triggered for the panel currently |
| 470 // being dragged. | 470 // being dragged. |
| 471 browser_view->OnTitleBarMousePressed(gfx::Point( | 471 browser_view->OnTitlebarMousePressed(gfx::Point( |
| 472 target_bounds.x(), target_bounds.y())); | 472 target_bounds.x(), target_bounds.y())); |
| 473 browser_view->OnTitleBarMouseDragged(gfx::Point( | 473 browser_view->OnTitlebarMouseDragged(gfx::Point( |
| 474 target_bounds.x() + 5, target_bounds.y() + 5)); | 474 target_bounds.x() + 5, target_bounds.y() + 5)); |
| 475 EXPECT_FALSE(browser_view->bounds_animator_->is_animating()); | 475 EXPECT_FALSE(browser_view->bounds_animator_->is_animating()); |
| 476 browser_view->OnTitleBarMouseCaptureLost(); | 476 browser_view->OnTitlebarMouseCaptureLost(); |
| 477 | 477 |
| 478 browser_view->panel()->Close(); | 478 browser_view->panel()->Close(); |
| 479 } | 479 } |
| 480 | 480 |
| 481 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, CreateSettingsMenu) { | 481 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, CreateSettingsMenu) { |
| 482 TestCreateSettingsMenuForExtension( | 482 TestCreateSettingsMenuForExtension( |
| 483 FILE_PATH_LITERAL("extension1"), Extension::EXTERNAL_POLICY_DOWNLOAD, | 483 FILE_PATH_LITERAL("extension1"), Extension::EXTERNAL_POLICY_DOWNLOAD, |
| 484 "", ""); | 484 "", ""); |
| 485 TestCreateSettingsMenuForExtension( | 485 TestCreateSettingsMenuForExtension( |
| 486 FILE_PATH_LITERAL("extension2"), Extension::INVALID, | 486 FILE_PATH_LITERAL("extension2"), Extension::INVALID, |
| 487 "http://home", "options.html"); | 487 "http://home", "options.html"); |
| 488 } | 488 } |
| 489 | 489 |
| 490 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, MinimizeAndRestore) { | 490 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, MinimizeAndRestore) { |
| 491 TestMinimizeAndRestore(); | 491 TestMinimizeAndRestore(); |
| 492 } | 492 } |
| 493 | 493 |
| 494 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, DrawAttention) { | 494 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, DrawAttention) { |
| 495 TestDrawAttention(); | 495 TestDrawAttention(); |
| 496 } | 496 } |
| 497 #endif | 497 #endif |
| OLD | NEW |