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/common/accelerators/accelerator_commands.h" | 5 #include "ash/accelerators/accelerator_commands.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_commands_aura.h" | 7 #include "ash/accelerators/accelerator_commands_aura.h" |
8 #include "ash/common/wm/window_state.h" | |
9 #include "ash/common/wm_window.h" | |
10 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/wm/window_state.h" |
11 #include "ash/wm/window_state_aura.h" | 10 #include "ash/wm/window_state_aura.h" |
| 11 #include "ash/wm_window.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
15 #include "chrome/browser/apps/app_browsertest_util.h" | 15 #include "chrome/browser/apps/app_browsertest_util.h" |
16 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/browser_commands.h" | 17 #include "chrome/browser/ui/browser_commands.h" |
18 #include "chrome/browser/ui/browser_finder.h" | 18 #include "chrome/browser/ui/browser_finder.h" |
19 #include "chrome/browser/ui/browser_window.h" | 19 #include "chrome/browser/ui/browser_window.h" |
20 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
21 #include "chrome/test/base/in_process_browser_test.h" | 21 #include "chrome/test/base/in_process_browser_test.h" |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
308 CloseAppWindow(app_window); | 308 CloseAppWindow(app_window); |
309 } | 309 } |
310 } | 310 } |
311 | 311 |
312 INSTANTIATE_TEST_CASE_P(InitiallyRestored, | 312 INSTANTIATE_TEST_CASE_P(InitiallyRestored, |
313 AcceleratorCommandsPlatformAppFullscreenBrowserTest, | 313 AcceleratorCommandsPlatformAppFullscreenBrowserTest, |
314 Values(ui::SHOW_STATE_NORMAL)); | 314 Values(ui::SHOW_STATE_NORMAL)); |
315 INSTANTIATE_TEST_CASE_P(InitiallyMaximized, | 315 INSTANTIATE_TEST_CASE_P(InitiallyMaximized, |
316 AcceleratorCommandsPlatformAppFullscreenBrowserTest, | 316 AcceleratorCommandsPlatformAppFullscreenBrowserTest, |
317 Values(ui::SHOW_STATE_MAXIMIZED)); | 317 Values(ui::SHOW_STATE_MAXIMIZED)); |
OLD | NEW |