| 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/common/window_resizer.h" |
| 11 #include "ash/wm/common/window_state.h" |
| 10 #include "ash/wm/window_positioner.h" | 12 #include "ash/wm/window_positioner.h" |
| 11 #include "ash/wm/window_resizer.h" | |
| 12 #include "ash/wm/window_state.h" | |
| 13 #include "ash/wm/window_state_aura.h" | 13 #include "ash/wm/window_state_aura.h" |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
| 16 #include "build/build_config.h" | 16 #include "build/build_config.h" |
| 17 #include "chrome/browser/ui/ash/ash_util.h" | 17 #include "chrome/browser/ui/ash/ash_util.h" |
| 18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
| 19 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" | 19 #include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h" |
| 20 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
| 21 #include "chrome/test/base/test_browser_window_aura.h" | 21 #include "chrome/test/base/test_browser_window_aura.h" |
| 22 #include "chrome/test/base/testing_profile.h" | 22 #include "chrome/test/base/testing_profile.h" |
| (...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 898 EXPECT_EQ( | 898 EXPECT_EQ( |
| 899 ui::SHOW_STATE_DEFAULT, | 899 ui::SHOW_STATE_DEFAULT, |
| 900 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, | 900 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, |
| 901 trusted_popup.get(), p1280x1024, p1600x1200)); | 901 trusted_popup.get(), p1280x1024, p1600x1200)); |
| 902 // A popup that is sized to occupy the whole work area has default state. | 902 // A popup that is sized to occupy the whole work area has default state. |
| 903 EXPECT_EQ( | 903 EXPECT_EQ( |
| 904 ui::SHOW_STATE_DEFAULT, | 904 ui::SHOW_STATE_DEFAULT, |
| 905 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, | 905 GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH, |
| 906 trusted_popup.get(), p1600x1200, p1600x1200)); | 906 trusted_popup.get(), p1600x1200, p1600x1200)); |
| 907 } | 907 } |
| OLD | NEW |