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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 2870473002: Revert of 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.h ('k') | ash/tray_action/tray_action.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 568b90a6400e8363cadc20e26c77642632dfe830..8cdfec9c861977a5c88ca323d51d7546de3f1125 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -84,7 +84,6 @@
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/touch/ash_touch_transform_controller.h"
-#include "ash/tray_action/tray_action.h"
#include "ash/utility/screenshot_controller.h"
#include "ash/virtual_keyboard_controller.h"
#include "ash/wallpaper/wallpaper_controller.h"
@@ -558,7 +557,6 @@
shutdown_controller_(base::MakeUnique<ShutdownController>()),
system_tray_controller_(base::MakeUnique<SystemTrayController>()),
system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
- tray_action_(base::MakeUnique<TrayAction>()),
vpn_list_(base::MakeUnique<VpnList>()),
window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
window_selector_controller_(base::MakeUnique<WindowSelectorController>()),
« no previous file with comments | « ash/shell.h ('k') | ash/tray_action/tray_action.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698