Chromium Code Reviews| Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
| diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
| index e3367cc6e6974d55d5ee0029bb10c2dc9ec4980e..f6067899c996f5230e626f9ae57b102d3c516c89 100644 |
| --- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
| +++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
| @@ -13,6 +13,7 @@ |
| #include "ash/shell.h" |
| #include "base/memory/ptr_util.h" |
| #include "chrome/browser/chrome_browser_main.h" |
| +#include "chrome/browser/chromeos/lock_screen_apps/state_controller.h" |
| #include "chrome/browser/ui/ash/ash_init.h" |
| #include "chrome/browser/ui/ash/ash_util.h" |
| #include "chrome/browser/ui/ash/cast_config_client_media_router.h" |
| @@ -22,6 +23,7 @@ |
| #include "chrome/browser/ui/ash/media_client.h" |
| #include "chrome/browser/ui/ash/session_controller_client.h" |
| #include "chrome/browser/ui/ash/system_tray_client.h" |
| +#include "chrome/browser/ui/ash/tray_action_handler_client.h" |
| #include "chrome/browser/ui/ash/volume_controller.h" |
| #include "chrome/browser/ui/ash/vpn_list_forwarder.h" |
| #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
| @@ -108,6 +110,10 @@ void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
| base::MakeUnique<CastConfigClientMediaRouter>(); |
| media_client_ = base::MakeUnique<MediaClient>(); |
| + 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
|
| + lock_screen_apps::StateController::Get()); |
| + tray_action_handler_client_->Init(); |
| + |
| if (!ash::Shell::HasInstance()) |
| return; |
| @@ -128,6 +134,7 @@ void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
| system_tray_client_.reset(); |
| media_client_.reset(); |
| cast_config_client_media_router_.reset(); |
| + tray_action_handler_client_.reset(); |
| session_controller_client_.reset(); |
| ash_init_.reset(); |