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

Unified Diff: ash/shell.h

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments, fix mash_unittests Created 4 years, 6 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/mus/bridge/wm_shell_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 984482ff6694e885afc55d7860f9316c3b25486c..b960918ca943631498c22d14a7bdb2268db9c700 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -104,12 +104,10 @@ class GPUSupport;
class HighContrastController;
class KeyboardUI;
class KeyboardUMAEventFilter;
-class LastWindowClosedLogoutReminder;
class LinkHandlerModelFactory;
class LocaleNotificationController;
class LockStateController;
enum class LoginStatus;
-class LogoutConfirmationController;
class MagnificationController;
class MaximizeModeController;
class MaximizeModeWindowManager;
@@ -495,10 +493,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return resolution_notification_controller_.get();
}
- LogoutConfirmationController* logout_confirmation_controller() {
- return logout_confirmation_controller_.get();
- }
-
ScreenOrientationController* screen_orientation_controller() {
return screen_orientation_controller_.get();
}
@@ -699,9 +693,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
resolution_notification_controller_;
std::unique_ptr<BluetoothNotificationController>
bluetooth_notification_controller_;
- std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
- std::unique_ptr<LastWindowClosedLogoutReminder>
- last_window_closed_logout_reminder_;
std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
// Controls video output device state.
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698