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

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

Issue 2848813002: Introduce ash mojo interface for lock screen action handlers (Closed)
Patch Set: . Created 3 years, 7 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/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/public/cpp/mus_property_mirror_ash.h" 7 #include "ash/public/cpp/mus_property_mirror_ash.h"
8 #include "ash/public/cpp/window_pin_type.h" 8 #include "ash/public/cpp/window_pin_type.h"
9 #include "ash/public/cpp/window_properties.h" 9 #include "ash/public/cpp/window_properties.h"
10 #include "ash/public/interfaces/window_pin_type.mojom.h" 10 #include "ash/public/interfaces/window_pin_type.mojom.h"
11 #include "ash/root_window_controller.h" 11 #include "ash/root_window_controller.h"
12 #include "ash/shelf/shelf_model.h" 12 #include "ash/shelf/shelf_model.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "chrome/browser/chrome_browser_main.h" 15 #include "chrome/browser/chrome_browser_main.h"
16 #include "chrome/browser/chromeos/lock_screen_apps/state_controller.h"
16 #include "chrome/browser/ui/ash/ash_init.h" 17 #include "chrome/browser/ui/ash/ash_init.h"
17 #include "chrome/browser/ui/ash/ash_util.h" 18 #include "chrome/browser/ui/ash/ash_util.h"
18 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" 19 #include "chrome/browser/ui/ash/cast_config_client_media_router.h"
19 #include "chrome/browser/ui/ash/chrome_new_window_client.h" 20 #include "chrome/browser/ui/ash/chrome_new_window_client.h"
20 #include "chrome/browser/ui/ash/chrome_shell_content_state.h" 21 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"
21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 22 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
23 #include "chrome/browser/ui/ash/lock_screen_action_handler.h"
22 #include "chrome/browser/ui/ash/media_client.h" 24 #include "chrome/browser/ui/ash/media_client.h"
23 #include "chrome/browser/ui/ash/session_controller_client.h" 25 #include "chrome/browser/ui/ash/session_controller_client.h"
24 #include "chrome/browser/ui/ash/system_tray_client.h" 26 #include "chrome/browser/ui/ash/system_tray_client.h"
25 #include "chrome/browser/ui/ash/volume_controller.h" 27 #include "chrome/browser/ui/ash/volume_controller.h"
26 #include "chrome/browser/ui/ash/vpn_list_forwarder.h" 28 #include "chrome/browser/ui/ash/vpn_list_forwarder.h"
27 #include "chrome/browser/ui/views/ash/tab_scrubber.h" 29 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
28 #include "chrome/browser/ui/views/frame/immersive_context_mus.h" 30 #include "chrome/browser/ui/views/frame/immersive_context_mus.h"
29 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h" 31 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h"
30 #include "chrome/browser/ui/views/select_file_dialog_extension.h" 32 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
31 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" 33 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 70
69 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { 71 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
70 if (ash_util::ShouldOpenAshOnStartup()) 72 if (ash_util::ShouldOpenAshOnStartup())
71 ash_init_ = base::MakeUnique<AshInit>(); 73 ash_init_ = base::MakeUnique<AshInit>();
72 74
73 if (ash_util::IsRunningInMash()) { 75 if (ash_util::IsRunningInMash()) {
74 immersive_context_ = base::MakeUnique<ImmersiveContextMus>(); 76 immersive_context_ = base::MakeUnique<ImmersiveContextMus>();
75 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); 77 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
76 } 78 }
77 79
80 lock_screen_action_handler_ = base::MakeUnique<LockScreenActionHandler>(
81 lock_screen_apps::StateController::Get());
82 lock_screen_action_handler_->Init();
78 session_controller_client_ = base::MakeUnique<SessionControllerClient>(); 83 session_controller_client_ = base::MakeUnique<SessionControllerClient>();
79 session_controller_client_->Init(); 84 session_controller_client_->Init();
80 85
81 // Must be available at login screen, so initialize before profile. 86 // Must be available at login screen, so initialize before profile.
82 system_tray_client_ = base::MakeUnique<SystemTrayClient>(); 87 system_tray_client_ = base::MakeUnique<SystemTrayClient>();
83 new_window_client_ = base::MakeUnique<ChromeNewWindowClient>(); 88 new_window_client_ = base::MakeUnique<ChromeNewWindowClient>();
84 volume_controller_ = base::MakeUnique<VolumeController>(); 89 volume_controller_ = base::MakeUnique<VolumeController>();
85 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>(); 90 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>();
86 91
87 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile 92 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 vpn_list_forwarder_.reset(); 130 vpn_list_forwarder_.reset();
126 volume_controller_.reset(); 131 volume_controller_.reset();
127 new_window_client_.reset(); 132 new_window_client_.reset();
128 system_tray_client_.reset(); 133 system_tray_client_.reset();
129 media_client_.reset(); 134 media_client_.reset();
130 cast_config_client_media_router_.reset(); 135 cast_config_client_media_router_.reset();
131 session_controller_client_.reset(); 136 session_controller_client_.reset();
132 137
133 ash_init_.reset(); 138 ash_init_.reset();
134 } 139 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698