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

Unified Diff: ash/system/overview/overview_button_tray.h

Issue 1149833006: Stop the OverviewButton from appearing on the Add-User screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: ash/system/overview/overview_button_tray.h
diff --git a/ash/system/overview/overview_button_tray.h b/ash/system/overview/overview_button_tray.h
index a58bae11576457979207ee82e858ef9781a91a46..d3988be4d512dfcf48e89c1ed1de0b134705ec01 100644
--- a/ash/system/overview/overview_button_tray.h
+++ b/ash/system/overview/overview_button_tray.h
@@ -6,9 +6,9 @@
#define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
#include "ash/ash_export.h"
+#include "ash/session/session_state_observer.h"
#include "ash/shell_observer.h"
#include "ash/system/tray/tray_background_view.h"
-#include "ash/wm/overview/window_selector_controller.h"
namespace views {
class ImageView;
@@ -22,6 +22,7 @@ namespace ash {
// This tray will only be visible while in this state. This tray does not
// provide any bubble view windows.
class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView,
+ public SessionStateObserver,
public ShellObserver {
public:
explicit OverviewButtonTray(StatusAreaWidget* status_area_widget);
@@ -34,6 +35,9 @@ class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView,
// ActionableView:
bool PerformAction(const ui::Event& event) override;
+ // SessionStateObserver:
+ void SessionStateChanged(SessionStateDelegate::SessionState state) override;
+
// ShellObserver:
void OnMaximizeModeStarted() override;
void OnMaximizeModeEnded() override;
« no previous file with comments | « no previous file | ash/system/overview/overview_button_tray.cc » ('j') | ash/system/overview/overview_button_tray.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698