| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ash/accessibility_delegate.h" | 5 #include "ash/accessibility_delegate.h" |
| 6 #include "ash/drag_drop/drag_drop_controller.h" | 6 #include "ash/drag_drop/drag_drop_controller.h" |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/screen_util.h" | 8 #include "ash/screen_util.h" |
| 9 #include "ash/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" |
| 10 #include "ash/shelf/shelf_widget.h" | 10 #include "ash/shelf/shelf_widget.h" |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 scoped_ptr<aura::Window> window2(CreateWindow(bounds)); | 364 scoped_ptr<aura::Window> window2(CreateWindow(bounds)); |
| 365 Shell::GetInstance()->ToggleAppList(NULL); | 365 Shell::GetInstance()->ToggleAppList(NULL); |
| 366 EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); | 366 EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); |
| 367 ToggleOverview(); | 367 ToggleOverview(); |
| 368 EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility()); | 368 EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility()); |
| 369 ToggleOverview(); | 369 ToggleOverview(); |
| 370 } | 370 } |
| 371 | 371 |
| 372 // Tests that a minimized window's visibility and layer visibility is correctly | 372 // Tests that a minimized window's visibility and layer visibility is correctly |
| 373 // changed when entering overview and restored when leaving overview mode. | 373 // changed when entering overview and restored when leaving overview mode. |
| 374 TEST_F(WindowSelectorTest, MinimizedWindowVisibility) { | 374 // Crashes after the skia roll in http://crrev.com/274114. |
| 375 // http://crbug.com/379570 |
| 376 TEST_F(WindowSelectorTest, DISABLED_MinimizedWindowVisibility) { |
| 375 gfx::Rect bounds(0, 0, 400, 400); | 377 gfx::Rect bounds(0, 0, 400, 400); |
| 376 scoped_ptr<aura::Window> window1(CreateWindow(bounds)); | 378 scoped_ptr<aura::Window> window1(CreateWindow(bounds)); |
| 377 wm::WindowState* window_state = wm::GetWindowState(window1.get()); | 379 wm::WindowState* window_state = wm::GetWindowState(window1.get()); |
| 378 window_state->Minimize(); | 380 window_state->Minimize(); |
| 379 EXPECT_FALSE(window1->IsVisible()); | 381 EXPECT_FALSE(window1->IsVisible()); |
| 380 EXPECT_FALSE(window1->layer()->GetTargetVisibility()); | 382 EXPECT_FALSE(window1->layer()->GetTargetVisibility()); |
| 381 { | 383 { |
| 382 ui::ScopedAnimationDurationScaleMode normal_duration_mode( | 384 ui::ScopedAnimationDurationScaleMode normal_duration_mode( |
| 383 ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); | 385 ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); |
| 384 ToggleOverview(); | 386 ToggleOverview(); |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 762 UpdateDisplay("600x200/r"); | 764 UpdateDisplay("600x200/r"); |
| 763 EXPECT_EQ("0,0 200x600", root_window->bounds().ToString()); | 765 EXPECT_EQ("0,0 200x600", root_window->bounds().ToString()); |
| 764 for (ScopedVector<aura::Window>::iterator iter = windows.begin(); | 766 for (ScopedVector<aura::Window>::iterator iter = windows.begin(); |
| 765 iter != windows.end(); ++iter) { | 767 iter != windows.end(); ++iter) { |
| 766 EXPECT_TRUE(root_window->bounds().Contains( | 768 EXPECT_TRUE(root_window->bounds().Contains( |
| 767 ToEnclosingRect(GetTransformedTargetBounds(*iter)))); | 769 ToEnclosingRect(GetTransformedTargetBounds(*iter)))); |
| 768 } | 770 } |
| 769 } | 771 } |
| 770 | 772 |
| 771 } // namespace ash | 773 } // namespace ash |
| OLD | NEW |