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

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"
22 #include "chrome/browser/ui/ash/media_client.h" 23 #include "chrome/browser/ui/ash/media_client.h"
23 #include "chrome/browser/ui/ash/session_controller_client.h" 24 #include "chrome/browser/ui/ash/session_controller_client.h"
24 #include "chrome/browser/ui/ash/system_tray_client.h" 25 #include "chrome/browser/ui/ash/system_tray_client.h"
26 #include "chrome/browser/ui/ash/tray_action_handler_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"
32 #include "ui/aura/mus/property_converter.h" 34 #include "ui/aura/mus/property_converter.h"
33 #include "ui/base/class_property.h" 35 #include "ui/base/class_property.h"
34 #include "ui/keyboard/content/keyboard.h" 36 #include "ui/keyboard/content/keyboard.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 chrome_launcher_controller_ = base::MakeUnique<ChromeLauncherController>( 103 chrome_launcher_controller_ = base::MakeUnique<ChromeLauncherController>(
102 nullptr, chrome_shelf_model_.get()); 104 nullptr, chrome_shelf_model_.get());
103 chrome_launcher_controller_->Init(); 105 chrome_launcher_controller_->Init();
104 chrome_shell_content_state_ = base::MakeUnique<ChromeShellContentState>(); 106 chrome_shell_content_state_ = base::MakeUnique<ChromeShellContentState>();
105 } 107 }
106 108
107 cast_config_client_media_router_ = 109 cast_config_client_media_router_ =
108 base::MakeUnique<CastConfigClientMediaRouter>(); 110 base::MakeUnique<CastConfigClientMediaRouter>();
109 media_client_ = base::MakeUnique<MediaClient>(); 111 media_client_ = base::MakeUnique<MediaClient>();
110 112
113 tray_action_handler_client_ = base::MakeUnique<TrayActionHandlerClient>(
James Cook 2017/05/03 23:31:52 If you still need this class, can it be owned by C
tbarzic 2017/05/04 20:58:31 Done - kinda, I made ChroomeBrowserMainPartsChrome
114 lock_screen_apps::StateController::Get());
115 tray_action_handler_client_->Init();
116
111 if (!ash::Shell::HasInstance()) 117 if (!ash::Shell::HasInstance())
112 return; 118 return;
113 119
114 // Initialize TabScrubber after the Ash Shell has been initialized. 120 // Initialize TabScrubber after the Ash Shell has been initialized.
115 TabScrubber::GetInstance(); 121 TabScrubber::GetInstance();
116 // Activate virtual keyboard after profile is initialized. It depends on the 122 // Activate virtual keyboard after profile is initialized. It depends on the
117 // default profile. 123 // default profile.
118 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( 124 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
119 keyboard::KeyboardController::GetInstance()); 125 keyboard::KeyboardController::GetInstance());
120 } 126 }
121 127
122 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 128 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
123 chrome_launcher_controller_.reset(); 129 chrome_launcher_controller_.reset();
124 chrome_shelf_model_.reset(); 130 chrome_shelf_model_.reset();
125 vpn_list_forwarder_.reset(); 131 vpn_list_forwarder_.reset();
126 volume_controller_.reset(); 132 volume_controller_.reset();
127 new_window_client_.reset(); 133 new_window_client_.reset();
128 system_tray_client_.reset(); 134 system_tray_client_.reset();
129 media_client_.reset(); 135 media_client_.reset();
130 cast_config_client_media_router_.reset(); 136 cast_config_client_media_router_.reset();
137 tray_action_handler_client_.reset();
131 session_controller_client_.reset(); 138 session_controller_client_.reset();
132 139
133 ash_init_.reset(); 140 ash_init_.reset();
134 } 141 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698