chrome/browser/ui/ash/ash_init.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: Created 3 years, 9 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/app_list/app_list_interactive_uitest.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"

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

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

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

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

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

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

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

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

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

	15 #include "ash/wm_shell.h"

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

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

18 #include "base/threading/sequenced_worker_pool.h"	18 #include "base/threading/sequenced_worker_pool.h"

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

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

21 #include "chrome/browser/browser_process_platform_part.h"	21 #include "chrome/browser/browser_process_platform_part.h"

22 #include "chrome/browser/browser_shutdown.h"	22 #include "chrome/browser/browser_shutdown.h"

23 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	23 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

24 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"	24 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"

25 #include "chrome/browser/lifetime/application_lifetime.h"	25 #include "chrome/browser/lifetime/application_lifetime.h"

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
99 }	99 }

100	100

101 void CloseAsh() {	101 void CloseAsh() {

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

103 ash::Shell::DeleteInstance();	103 ash::Shell::DeleteInstance();

104 ash::ShellContentState::DestroyInstance();	104 ash::ShellContentState::DestroyInstance();

105 }	105 }

106 }	106 }

107	107

108 } // namespace chrome	108 } // namespace chrome

OLD	NEW