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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 2545723003: ash: Add SessionController/Client mojo interfaces (Closed)
Patch Set: rebase, use ash_util::GetAshServiceName 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:
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/views/ash/chrome_browser_main_extra_parts_ash.h" 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "chrome/browser/chrome_browser_main.h" 14 #include "chrome/browser/chrome_browser_main.h"
15 #include "chrome/browser/ui/ash/ash_init.h" 15 #include "chrome/browser/ui/ash/ash_init.h"
16 #include "chrome/browser/ui/ash/ash_util.h" 16 #include "chrome/browser/ui/ash/ash_util.h"
17 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" 17 #include "chrome/browser/ui/ash/cast_config_client_media_router.h"
18 #include "chrome/browser/ui/ash/chrome_new_window_client.h" 18 #include "chrome/browser/ui/ash/chrome_new_window_client.h"
19 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" 19 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
20 #include "chrome/browser/ui/views/ash/tab_scrubber.h" 20 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
21 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" 21 #include "chrome/browser/ui/views/frame/immersive_context_mus.h"
22 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" 22 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "ui/aura/env.h" 24 #include "ui/aura/env.h"
25 #include "ui/keyboard/content/keyboard.h" 25 #include "ui/keyboard/content/keyboard.h"
26 #include "ui/keyboard/keyboard_controller.h" 26 #include "ui/keyboard/keyboard_controller.h"
27 27
28 #if defined(OS_CHROMEOS) 28 #if defined(OS_CHROMEOS)
29 #include "chrome/browser/ui/ash/session_controller_client.h"
29 #include "chrome/browser/ui/ash/system_tray_client.h" 30 #include "chrome/browser/ui/ash/system_tray_client.h"
30 #include "chrome/browser/ui/ash/volume_controller.h" 31 #include "chrome/browser/ui/ash/volume_controller.h"
31 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" 32 #include "chrome/browser/ui/ash/vpn_list_forwarder.h"
32 #include "chrome/browser/ui/views/select_file_dialog_extension.h" 33 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
33 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" 34 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
34 #endif // defined(OS_CHROMEOS) 35 #endif // defined(OS_CHROMEOS)
35 36
36 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {} 37 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {}
37 38
38 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {} 39 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {}
39 40
40 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { 41 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
41 if (chrome::ShouldOpenAshOnStartup()) 42 if (chrome::ShouldOpenAshOnStartup())
42 chrome::OpenAsh(gfx::kNullAcceleratedWidget); 43 chrome::OpenAsh(gfx::kNullAcceleratedWidget);
43 44
44 if (chrome::IsRunningInMash()) { 45 if (chrome::IsRunningInMash()) {
45 immersive_context_ = base::MakeUnique<ImmersiveContextMus>(); 46 immersive_context_ = base::MakeUnique<ImmersiveContextMus>();
46 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); 47 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
47 } 48 }
48 49
49 #if defined(OS_CHROMEOS) 50 #if defined(OS_CHROMEOS)
51 // TODO(xiyuan): Update after SesssionStateDelegate is deprecated.
52 if (chrome::IsRunningInMash())
53 session_controller_client_ = base::MakeUnique<SessionControllerClient>();
54
50 // Must be available at login screen, so initialize before profile. 55 // Must be available at login screen, so initialize before profile.
51 system_tray_client_ = base::MakeUnique<SystemTrayClient>(); 56 system_tray_client_ = base::MakeUnique<SystemTrayClient>();
52 new_window_client_ = base::MakeUnique<ChromeNewWindowClient>(); 57 new_window_client_ = base::MakeUnique<ChromeNewWindowClient>();
53 volume_controller_ = base::MakeUnique<VolumeController>(); 58 volume_controller_ = base::MakeUnique<VolumeController>();
54 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>(); 59 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>();
55 60
56 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile 61 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile
57 // initialized. Otherwise, virtual keyboard extension will not load at login 62 // initialized. Otherwise, virtual keyboard extension will not load at login
58 // screen. 63 // screen.
59 keyboard::InitializeKeyboard(); 64 keyboard::InitializeKeyboard();
(...skipping 25 matching lines...) Expand all
85 keyboard::KeyboardController::GetInstance()); 90 keyboard::KeyboardController::GetInstance());
86 } 91 }
87 92
88 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 93 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
89 #if defined(OS_CHROMEOS) 94 #if defined(OS_CHROMEOS)
90 vpn_list_forwarder_.reset(); 95 vpn_list_forwarder_.reset();
91 volume_controller_.reset(); 96 volume_controller_.reset();
92 new_window_client_.reset(); 97 new_window_client_.reset();
93 system_tray_client_.reset(); 98 system_tray_client_.reset();
94 cast_config_client_media_router_.reset(); 99 cast_config_client_media_router_.reset();
100 session_controller_client_.reset();
95 #endif 101 #endif
96 chrome::CloseAsh(); 102 chrome::CloseAsh();
97 } 103 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h ('k') | components/session_manager/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698