chrome/browser/ui/ash/ash_init.cc - Issue 2314853003: Move ash::DisplayManager switches to ui::display

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)

Patch Set: rebased again 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

« no previous file with comments | « chrome/browser/ui/ash/accelerator_commands_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/ui/ash/ash_init.h"	5 #include "chrome/browser/ui/ash/ash_init.h"

6	6

7 #include "ash/accelerators/accelerator_controller_delegate_aura.h"	7 #include "ash/accelerators/accelerator_controller_delegate_aura.h"

8 #include "ash/common/accelerators/accelerator_controller.h"	8 #include "ash/common/accelerators/accelerator_controller.h"

9 #include "ash/common/accessibility_types.h"	9 #include "ash/common/accessibility_types.h"

10 #include "ash/common/ash_switches.h"

11 #include "ash/common/wm_shell.h"	10 #include "ash/common/wm_shell.h"

12 #include "ash/high_contrast/high_contrast_controller.h"	11 #include "ash/high_contrast/high_contrast_controller.h"

13 #include "ash/magnifier/magnification_controller.h"	12 #include "ash/magnifier/magnification_controller.h"

14 #include "ash/magnifier/partial_magnification_controller.h"	13 #include "ash/magnifier/partial_magnification_controller.h"

15 #include "ash/shell.h"	14 #include "ash/shell.h"

16 #include "ash/shell_init_params.h"	15 #include "ash/shell_init_params.h"

17 #include "base/command_line.h"	16 #include "base/command_line.h"

18 #include "base/sys_info.h"	17 #include "base/sys_info.h"

19 #include "build/build_config.h"	18 #include "build/build_config.h"

20 #include "chrome/browser/browser_process.h"	19 #include "chrome/browser/browser_process.h"

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 }	103 }

105	104

106 void CloseAsh() {	105 void CloseAsh() {

107 if (ash::Shell::HasInstance()) {	106 if (ash::Shell::HasInstance()) {

108 ash::Shell::DeleteInstance();	107 ash::Shell::DeleteInstance();

109 ash::ShellContentState::DestroyInstance();	108 ash::ShellContentState::DestroyInstance();

110 }	109 }

111 }	110 }

112	111

113 } // namespace chrome	112 } // namespace chrome

OLD	NEW