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/common/scoped_root_window_for_new_windows.h" | 5 #include "ash/scoped_root_window_for_new_windows.h" |
6 #include "ash/common/wm_shell.h" | |
7 #include "ash/common/wm_window.h" | |
8 #include "ash/shell.h" | 6 #include "ash/shell.h" |
9 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
10 #include "ash/wm/window_positioner.h" | 8 #include "ash/wm/window_positioner.h" |
11 #include "ash/wm/window_resizer.h" | 9 #include "ash/wm/window_resizer.h" |
12 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
13 #include "ash/wm/window_state_aura.h" | 11 #include "ash/wm/window_state_aura.h" |
| 12 #include "ash/wm_shell.h" |
| 13 #include "ash/wm_window.h" |
14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
16 #include "chrome/browser/ui/ash/ash_util.h" | 16 #include "chrome/browser/ui/ash/ash_util.h" |
17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" | 18 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" |
19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
20 #include "chrome/test/base/test_browser_window_aura.h" | 20 #include "chrome/test/base/test_browser_window_aura.h" |
21 #include "chrome/test/base/testing_profile.h" | 21 #include "chrome/test/base/testing_profile.h" |
22 #include "content/public/test/render_view_test.h" | 22 #include "content/public/test/render_view_test.h" |
23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
861 EXPECT_EQ( | 861 EXPECT_EQ( |
862 ui::SHOW_STATE_DEFAULT, | 862 ui::SHOW_STATE_DEFAULT, |
863 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, | 863 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, |
864 trusted_popup.get(), p1280x1024, p1600x1200)); | 864 trusted_popup.get(), p1280x1024, p1600x1200)); |
865 // A popup that is sized to occupy the whole work area has default state. | 865 // A popup that is sized to occupy the whole work area has default state. |
866 EXPECT_EQ( | 866 EXPECT_EQ( |
867 ui::SHOW_STATE_DEFAULT, | 867 ui::SHOW_STATE_DEFAULT, |
868 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, | 868 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, |
869 trusted_popup.get(), p1600x1200, p1600x1200)); | 869 trusted_popup.get(), p1600x1200, p1600x1200)); |
870 } | 870 } |
OLD | NEW |