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

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

Issue 2059963002: Mustash implementation of ChromeLauncherController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@launcher_controller_mus_5
Patch Set: Created 4 years, 6 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 (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.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/high_contrast/high_contrast_controller.h" 9 #include "ash/high_contrast/high_contrast_controller.h"
10 #include "ash/magnifier/magnification_controller.h" 10 #include "ash/magnifier/magnification_controller.h"
(...skipping 21 matching lines...) Expand all
32 #include "content/public/browser/browser_thread.h" 32 #include "content/public/browser/browser_thread.h"
33 #include "content/public/browser/context_factory.h" 33 #include "content/public/browser/context_factory.h"
34 #include "ui/aura/env.h" 34 #include "ui/aura/env.h"
35 #include "ui/aura/window_tree_host.h" 35 #include "ui/aura/window_tree_host.h"
36 36
37 #if defined(USE_X11) 37 #if defined(USE_X11)
38 #include "ui/base/x/x11_util.h" 38 #include "ui/base/x/x11_util.h"
39 #endif 39 #endif
40 40
41 #if defined(MOJO_SHELL_CLIENT) 41 #if defined(MOJO_SHELL_CLIENT)
42 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
42 #include "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h" 43 #include "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"
43 #endif 44 #endif
44 45
45 namespace chrome { 46 namespace chrome {
46 47
47 void OpenAsh(gfx::AcceleratedWidget remote_window) { 48 void OpenAsh(gfx::AcceleratedWidget remote_window) {
48 #if defined(USE_X11) 49 #if defined(USE_X11)
49 if (base::SysInfo::IsRunningOnChromeOS()) { 50 if (base::SysInfo::IsRunningOnChromeOS()) {
50 // Hides the cursor outside of the Aura root window. The cursor will be 51 // Hides the cursor outside of the Aura root window. The cursor will be
51 // drawn within the Aura root window, and it'll remain hidden after the 52 // drawn within the Aura root window, and it'll remain hidden after the
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 switches::kDisableZeroBrowsersOpenForTests)) { 96 switches::kDisableZeroBrowsersOpenForTests)) {
96 g_browser_process->platform_part()->RegisterKeepAlive(); 97 g_browser_process->platform_part()->RegisterKeepAlive();
97 } 98 }
98 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); 99 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
99 } 100 }
100 101
101 void InitializeMash() { 102 void InitializeMash() {
102 #if defined(MOJO_SHELL_CLIENT) 103 #if defined(MOJO_SHELL_CLIENT)
103 DCHECK(!ash::Shell::HasInstance()); 104 DCHECK(!ash::Shell::HasInstance());
104 ChromeMashShelfController::CreateInstance(); 105 ChromeMashShelfController::CreateInstance();
106 ChromeLauncherControllerMus::CreateInstance();
105 #endif 107 #endif
106 } 108 }
107 109
108 void CloseAsh() { 110 void CloseAsh() {
109 if (ash::Shell::HasInstance()) { 111 if (ash::Shell::HasInstance()) {
110 ash::Shell::DeleteInstance(); 112 ash::Shell::DeleteInstance();
111 ash::ShellContentState::DestroyInstance(); 113 ash::ShellContentState::DestroyInstance();
112 } 114 }
113 } 115 }
114 116
115 } // namespace chrome 117 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698