chrome/browser/ui/ash/ash_init.cc - Issue 2166793005: Moves accelerator code using common types to ash/common

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 2166793005: Moves accelerator code using common types to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@debug_commands

Patch Set: not relative Created 4 years, 5 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_controller_browsertest.cc ('k') | chrome/browser/ui/ash/ash_util.cc » ('j') | no next file with comments »

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.h"

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

9 #include "ash/autoclick/autoclick_controller.h"	8 #include "ash/autoclick/autoclick_controller.h"

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

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

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

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

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

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

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

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

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

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

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

(...skipping 92 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
112 }	112 }

113	113

114 void CloseAsh() {	114 void CloseAsh() {

115 if (ash::Shell::HasInstance()) {	115 if (ash::Shell::HasInstance()) {

116 ash::Shell::DeleteInstance();	116 ash::Shell::DeleteInstance();

117 ash::ShellContentState::DestroyInstance();	117 ash::ShellContentState::DestroyInstance();

118 }	118 }

119 }	119 }

120	120

121 } // namespace chrome	121 } // namespace chrome

OLD	NEW