| 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" |
| 11 #include "ash/wm/window_resizer.h" | 11 #include "ash/wm/window_resizer.h" |
| 12 #include "ash/wm/window_state.h" | 12 #include "ash/wm/window_state.h" |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "chrome/browser/ui/ash/ash_init.h" | 14 #include "chrome/browser/ui/ash/ash_init.h" |
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" | 16 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" |
| 17 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
| 18 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" |
| 19 #include "content/public/test/render_view_test.h" | 19 #include "content/public/test/render_view_test.h" |
| 20 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
| 21 #include "ui/aura/client/activation_client.h" | 21 #include "ui/aura/client/activation_client.h" |
| 22 #include "ui/aura/client/aura_constants.h" | 22 #include "ui/aura/client/aura_constants.h" |
| 23 #include "ui/aura/env.h" | 23 #include "ui/aura/env.h" |
| 24 #include "ui/aura/root_window.h" | |
| 25 #include "ui/aura/test/test_windows.h" | 24 #include "ui/aura/test/test_windows.h" |
| 25 #include "ui/aura/window_event_dispatcher.h" |
| 26 #include "ui/gfx/screen.h" | 26 #include "ui/gfx/screen.h" |
| 27 | 27 |
| 28 typedef ash::test::AshTestBase WindowSizerAshTest; | 28 typedef ash::test::AshTestBase WindowSizerAshTest; |
| 29 | 29 |
| 30 namespace { | 30 namespace { |
| 31 | 31 |
| 32 // A browser window proxy which is able to associate an aura native window with | 32 // A browser window proxy which is able to associate an aura native window with |
| 33 // it. | 33 // it. |
| 34 class TestBrowserWindowAura : public TestBrowserWindow { | 34 class TestBrowserWindowAura : public TestBrowserWindow { |
| 35 public: | 35 public: |
| (...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 891 ui::WindowShowState show_state; | 891 ui::WindowShowState show_state; |
| 892 WindowSizer::GetBrowserWindowBoundsAndShowState( | 892 WindowSizer::GetBrowserWindowBoundsAndShowState( |
| 893 std::string(), | 893 std::string(), |
| 894 gfx::Rect(), | 894 gfx::Rect(), |
| 895 NULL, | 895 NULL, |
| 896 &bounds, | 896 &bounds, |
| 897 &show_state); | 897 &show_state); |
| 898 EXPECT_TRUE(second_root->GetBoundsInScreen().Contains(bounds)); | 898 EXPECT_TRUE(second_root->GetBoundsInScreen().Contains(bounds)); |
| 899 } | 899 } |
| 900 } | 900 } |
| OLD | NEW |