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/accelerators/accelerator_commands.h" | 5 #include "ash/accelerators/accelerator_commands.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | |
8 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
| 8 #include "ash/common/ash_switches.h" |
9 #include "ash/common/wm/window_state.h" | 9 #include "ash/common/wm/window_state.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "ash/wm/window_state_aura.h" | 11 #include "ash/wm/window_state_aura.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" |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 CloseAppWindow(app_window); | 306 CloseAppWindow(app_window); |
307 } | 307 } |
308 } | 308 } |
309 | 309 |
310 INSTANTIATE_TEST_CASE_P(InitiallyRestored, | 310 INSTANTIATE_TEST_CASE_P(InitiallyRestored, |
311 AcceleratorCommandsPlatformAppFullscreenBrowserTest, | 311 AcceleratorCommandsPlatformAppFullscreenBrowserTest, |
312 Values(ui::SHOW_STATE_NORMAL)); | 312 Values(ui::SHOW_STATE_NORMAL)); |
313 INSTANTIATE_TEST_CASE_P(InitiallyMaximized, | 313 INSTANTIATE_TEST_CASE_P(InitiallyMaximized, |
314 AcceleratorCommandsPlatformAppFullscreenBrowserTest, | 314 AcceleratorCommandsPlatformAppFullscreenBrowserTest, |
315 Values(ui::SHOW_STATE_MAXIMIZED)); | 315 Values(ui::SHOW_STATE_MAXIMIZED)); |
OLD | NEW |