chrome/browser/ui/ash/ash_init.cc - Issue 2552483002: mash: Have chrome set itself as a controller interface for changing volume

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

Issue 2552483002: mash: Have chrome set itself as a controller interface for changing volume (Closed)

Patch Set: comment Created 4 years ago

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

Jump to:

« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/ash/ash_util.h » ('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_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/wm_shell.h"	10 #include "ash/common/wm_shell.h"

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

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

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

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

15 #include "ash/shell_init_params.h"	15 #include "ash/shell_init_params.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 "build/build_config.h"	18 #include "build/build_config.h"

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

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

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

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

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

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

25 #include "chrome/browser/ui/ash/chrome_screenshot_grabber.h"	25 #include "chrome/browser/ui/ash/chrome_screenshot_grabber.h"

26 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"	26 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"

27 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"	27 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"

28 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"	28 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"

29 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"

30 #include "chrome/common/chrome_switches.h"	29 #include "chrome/common/chrome_switches.h"

31 #include "chromeos/accelerometer/accelerometer_reader.h"	30 #include "chromeos/accelerometer/accelerometer_reader.h"

32 #include "chromeos/chromeos_switches.h"	31 #include "chromeos/chromeos_switches.h"

33 #include "chromeos/login/login_state.h"	32 #include "chromeos/login/login_state.h"

34 #include "content/public/browser/browser_thread.h"	33 #include "content/public/browser/browser_thread.h"

35 #include "content/public/browser/context_factory.h"	34 #include "content/public/browser/context_factory.h"

36 #include "ui/aura/env.h"	35 #include "ui/aura/env.h"

37 #include "ui/aura/window_tree_host.h"	36 #include "ui/aura/window_tree_host.h"

38	37

39 #if defined(USE_X11)	38 #if defined(USE_X11)

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97 }	96 }

98	97

99 void CloseAsh() {	98 void CloseAsh() {

100 if (ash::Shell::HasInstance()) {	99 if (ash::Shell::HasInstance()) {

101 ash::Shell::DeleteInstance();	100 ash::Shell::DeleteInstance();

102 ash::ShellContentState::DestroyInstance();	101 ash::ShellContentState::DestroyInstance();

103 }	102 }

104 }	103 }

105	104

106 } // namespace chrome	105 } // namespace chrome

OLD	NEW