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

Side by Side Diff: ash/common/system/chromeos/palette/palette_tray.h

Issue 2416253004: ash: Use session_manager::SessionState (Closed)
Patch Set: add comment about session state in SessionStaetDelegateChromeos Created 4 years, 2 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 29 matching lines...) Expand all
40 public PaletteToolManager::Delegate, 40 public PaletteToolManager::Delegate,
41 public views::TrayBubbleView::Delegate { 41 public views::TrayBubbleView::Delegate {
42 public: 42 public:
43 explicit PaletteTray(WmShelf* wm_shelf); 43 explicit PaletteTray(WmShelf* wm_shelf);
44 ~PaletteTray() override; 44 ~PaletteTray() override;
45 45
46 // ActionableView: 46 // ActionableView:
47 bool PerformAction(const ui::Event& event) override; 47 bool PerformAction(const ui::Event& event) override;
48 48
49 // SessionStateObserver: 49 // SessionStateObserver:
50 void SessionStateChanged(SessionStateDelegate::SessionState state) override; 50 void SessionStateChanged(session_manager::SessionState state) override;
51 51
52 // ShellObserver: 52 // ShellObserver:
53 void OnLockStateChanged(bool locked) override; 53 void OnLockStateChanged(bool locked) override;
54 54
55 // TrayBackgroundView: 55 // TrayBackgroundView:
56 void ClickedOutsideBubble() override; 56 void ClickedOutsideBubble() override;
57 base::string16 GetAccessibleNameForTray() override; 57 base::string16 GetAccessibleNameForTray() override;
58 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 58 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
59 void SetShelfAlignment(ShelfAlignment alignment) override; 59 void SetShelfAlignment(ShelfAlignment alignment) override;
60 void AnchorUpdated() override; 60 void AnchorUpdated() override;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 int num_actions_in_bubble_ = 0; 134 int num_actions_in_bubble_ = 0;
135 135
136 base::WeakPtrFactory<PaletteTray> weak_factory_; 136 base::WeakPtrFactory<PaletteTray> weak_factory_;
137 137
138 DISALLOW_COPY_AND_ASSIGN(PaletteTray); 138 DISALLOW_COPY_AND_ASSIGN(PaletteTray);
139 }; 139 };
140 140
141 } // namespace ash 141 } // namespace ash
142 142
143 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_ 143 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_locking_manager_unittest.cc ('k') | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698