Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: chrome/browser/ui/ash/accelerator_commands_browsertest.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/common/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/aura/wm_window_aura.h" 8 #include "ash/aura/wm_window_aura.h"
9 #include "ash/common/ash_switches.h" 9
10 #include "ash/common/wm/window_state.h" 10 #include "ash/common/wm/window_state.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/wm/window_state_aura.h" 12 #include "ash/wm/window_state_aura.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/apps/app_browsertest_util.h" 16 #include "chrome/browser/apps/app_browsertest_util.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_commands.h" 18 #include "chrome/browser/ui/browser_commands.h"
19 #include "chrome/browser/ui/browser_finder.h" 19 #include "chrome/browser/ui/browser_finder.h"
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
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));
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698