| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/scoped_target_root_window.h" | 5 #include "ash/scoped_target_root_window.h" |
| 6 #include "ash/screen_util.h" | 6 #include "ash/screen_util.h" |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" |
| 9 #include "ash/test/test_shell_delegate.h" | 9 #include "ash/test/test_shell_delegate.h" |
| 10 #include "ash/wm/window_positioner.h" | 10 #include "ash/wm/window_positioner.h" |
| (...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 863 // the non browser window. This differ from PersistedBoundsCase | 863 // the non browser window. This differ from PersistedBoundsCase |
| 864 // in that this uses real ash shell implementations + StateProvider | 864 // in that this uses real ash shell implementations + StateProvider |
| 865 // TargetDisplayProvider, rather than mocks. | 865 // TargetDisplayProvider, rather than mocks. |
| 866 TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) { | 866 TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) { |
| 867 if (!SupportsMultipleDisplays() || !chrome::ShouldOpenAshOnStartup()) | 867 if (!SupportsMultipleDisplays() || !chrome::ShouldOpenAshOnStartup()) |
| 868 return; | 868 return; |
| 869 UpdateDisplay("500x500,600x600"); | 869 UpdateDisplay("500x500,600x600"); |
| 870 { | 870 { |
| 871 aura::Window* first_root = | 871 aura::Window* first_root = |
| 872 ash::Shell::GetAllRootWindows()[0]; | 872 ash::Shell::GetAllRootWindows()[0]; |
| 873 ash::internal::ScopedTargetRootWindow tmp( | 873 ash::ScopedTargetRootWindow tmp(first_root); |
| 874 first_root); | |
| 875 gfx::Rect bounds; | 874 gfx::Rect bounds; |
| 876 ui::WindowShowState show_state; | 875 ui::WindowShowState show_state; |
| 877 WindowSizer::GetBrowserWindowBoundsAndShowState( | 876 WindowSizer::GetBrowserWindowBoundsAndShowState( |
| 878 std::string(), | 877 std::string(), |
| 879 gfx::Rect(), | 878 gfx::Rect(), |
| 880 NULL, | 879 NULL, |
| 881 &bounds, | 880 &bounds, |
| 882 &show_state); | 881 &show_state); |
| 883 EXPECT_TRUE(first_root->GetBoundsInScreen().Contains(bounds)); | 882 EXPECT_TRUE(first_root->GetBoundsInScreen().Contains(bounds)); |
| 884 } | 883 } |
| 885 { | 884 { |
| 886 aura::Window* second_root = | 885 aura::Window* second_root = |
| 887 ash::Shell::GetAllRootWindows()[1]; | 886 ash::Shell::GetAllRootWindows()[1]; |
| 888 ash::internal::ScopedTargetRootWindow tmp( | 887 ash::ScopedTargetRootWindow tmp(second_root); |
| 889 second_root); | |
| 890 gfx::Rect bounds; | 888 gfx::Rect bounds; |
| 891 ui::WindowShowState show_state; | 889 ui::WindowShowState show_state; |
| 892 WindowSizer::GetBrowserWindowBoundsAndShowState( | 890 WindowSizer::GetBrowserWindowBoundsAndShowState( |
| 893 std::string(), | 891 std::string(), |
| 894 gfx::Rect(), | 892 gfx::Rect(), |
| 895 NULL, | 893 NULL, |
| 896 &bounds, | 894 &bounds, |
| 897 &show_state); | 895 &show_state); |
| 898 EXPECT_TRUE(second_root->GetBoundsInScreen().Contains(bounds)); | 896 EXPECT_TRUE(second_root->GetBoundsInScreen().Contains(bounds)); |
| 899 } | 897 } |
| 900 } | 898 } |
| OLD | NEW |