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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 5 #ifndef ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
6 #define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 6 #define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/session/session_state_observer.h"
9 #include "ash/shell_observer.h" 10 #include "ash/shell_observer.h"
10 #include "ash/system/tray/tray_background_view.h" 11 #include "ash/system/tray/tray_background_view.h"
11 #include "ash/wm/overview/window_selector_controller.h" 12 #include "ash/wm/overview/window_selector_controller.h"
12 13
13 namespace views { 14 namespace views {
14 class ImageView; 15 class ImageView;
15 } 16 }
16 17
17 namespace ash { 18 namespace ash {
18 19
19 // Status area tray for showing a toggle for Overview Mode. Overview Mode 20 // Status area tray for showing a toggle for Overview Mode. Overview Mode
20 // is equivalent to WindowSelectorController being in selection mode. 21 // is equivalent to WindowSelectorController being in selection mode.
21 // This hosts a ShellObserver that listens for the activation of Maximize Mode 22 // This hosts a ShellObserver that listens for the activation of Maximize Mode
22 // This tray will only be visible while in this state. This tray does not 23 // This tray will only be visible while in this state. This tray does not
23 // provide any bubble view windows. 24 // provide any bubble view windows.
24 class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView, 25 class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView,
26 public SessionStateObserver,
25 public ShellObserver { 27 public ShellObserver {
26 public: 28 public:
27 explicit OverviewButtonTray(StatusAreaWidget* status_area_widget); 29 explicit OverviewButtonTray(StatusAreaWidget* status_area_widget);
28 ~OverviewButtonTray() override; 30 ~OverviewButtonTray() override;
29 31
30 // Updates the tray's visibility based on the LoginStatus and the current 32 // Updates the tray's visibility based on the LoginStatus and the current
31 // state of MaximizeMode 33 // state of MaximizeMode
32 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status); 34 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status);
33 35
34 // ActionableView: 36 // ActionableView:
35 bool PerformAction(const ui::Event& event) override; 37 bool PerformAction(const ui::Event& event) override;
36 38
39 // SessionStateObserver:
40 void SessionStateChanged(SessionStateDelegate::SessionState state) override;
41
37 // ShellObserver: 42 // ShellObserver:
38 void OnMaximizeModeStarted() override; 43 void OnMaximizeModeStarted() override;
39 void OnMaximizeModeEnded() override; 44 void OnMaximizeModeEnded() override;
40 void OnOverviewModeEnded() override; 45 void OnOverviewModeEnded() override;
41 46
42 // TrayBackgroundView: 47 // TrayBackgroundView:
43 bool ClickedOutsideBubble() override; 48 bool ClickedOutsideBubble() override;
44 base::string16 GetAccessibleNameForTray() override; 49 base::string16 GetAccessibleNameForTray() override;
45 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 50 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
46 void SetShelfAlignment(ShelfAlignment alignment) override; 51 void SetShelfAlignment(ShelfAlignment alignment) override;
(...skipping 11 matching lines...) Expand all
58 63
59 // Weak pointer, will be parented by TrayContainer for its lifetime. 64 // Weak pointer, will be parented by TrayContainer for its lifetime.
60 views::ImageView* icon_; 65 views::ImageView* icon_;
61 66
62 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray); 67 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray);
63 }; 68 };
64 69
65 } // namespace ash 70 } // namespace ash
66 71
67 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 72 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
OLDNEW
« 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