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

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: fix gn check and address comments in #6 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/launcher/chrome_launcher_controller_mus.h" 18 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
19 #include "chrome/browser/ui/views/ash/tab_scrubber.h" 19 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
20 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" 20 #include "chrome/browser/ui/views/frame/immersive_context_mus.h"
21 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" 21 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h"
22 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
23 #include "ui/aura/env.h" 23 #include "ui/aura/env.h"
24 #include "ui/keyboard/content/keyboard.h" 24 #include "ui/keyboard/content/keyboard.h"
25 #include "ui/keyboard/keyboard_controller.h" 25 #include "ui/keyboard/keyboard_controller.h"
26 26
27 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
28 #include "chrome/browser/ui/ash/session_controller_client.h"
28 #include "chrome/browser/ui/ash/system_tray_client.h" 29 #include "chrome/browser/ui/ash/system_tray_client.h"
29 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" 30 #include "chrome/browser/ui/ash/vpn_list_forwarder.h"
30 #include "chrome/browser/ui/views/select_file_dialog_extension.h" 31 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
31 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" 32 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
32 #endif // defined(OS_CHROMEOS) 33 #endif // defined(OS_CHROMEOS)
33 34
34 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {} 35 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {}
35 36
36 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {} 37 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {}
37 38
38 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { 39 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
39 if (chrome::ShouldOpenAshOnStartup()) 40 if (chrome::ShouldOpenAshOnStartup())
40 chrome::OpenAsh(gfx::kNullAcceleratedWidget); 41 chrome::OpenAsh(gfx::kNullAcceleratedWidget);
41 42
42 if (chrome::IsRunningInMash()) { 43 if (chrome::IsRunningInMash()) {
43 immersive_context_ = base::MakeUnique<ImmersiveContextMus>(); 44 immersive_context_ = base::MakeUnique<ImmersiveContextMus>();
44 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); 45 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
45 } 46 }
46 47
47 #if defined(OS_CHROMEOS) 48 #if defined(OS_CHROMEOS)
49 // TODO(xiyuan): Update after SesssionStateDelegate is deprecated.
50 if (chrome::IsRunningInMash())
51 session_controller_client_ = base::MakeUnique<SessionControllerClient>();
52
48 // Must be available at login screen, so initialize before profile. 53 // Must be available at login screen, so initialize before profile.
49 system_tray_client_ = base::MakeUnique<SystemTrayClient>(); 54 system_tray_client_ = base::MakeUnique<SystemTrayClient>();
50 55
51 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>(); 56 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>();
52 57
53 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile 58 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile
54 // initialized. Otherwise, virtual keyboard extension will not load at login 59 // initialized. Otherwise, virtual keyboard extension will not load at login
55 // screen. 60 // screen.
56 keyboard::InitializeKeyboard(); 61 keyboard::InitializeKeyboard();
57 62
(...skipping 22 matching lines...) Expand all
80 // default profile. 85 // default profile.
81 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( 86 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
82 keyboard::KeyboardController::GetInstance()); 87 keyboard::KeyboardController::GetInstance());
83 } 88 }
84 89
85 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 90 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
86 #if defined(OS_CHROMEOS) 91 #if defined(OS_CHROMEOS)
87 vpn_list_forwarder_.reset(); 92 vpn_list_forwarder_.reset();
88 system_tray_client_.reset(); 93 system_tray_client_.reset();
89 cast_config_client_media_router_.reset(); 94 cast_config_client_media_router_.reset();
95 session_controller_client_.reset();
90 #endif 96 #endif
91 chrome::CloseAsh(); 97 chrome::CloseAsh();
92 } 98 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698