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

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

Issue 2280293002: Hide ash palette on lock screen, show it in guest mode. (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 27 matching lines...) Expand all
38 public: 38 public:
39 explicit PaletteTray(WmShelf* wm_shelf); 39 explicit PaletteTray(WmShelf* wm_shelf);
40 ~PaletteTray() override; 40 ~PaletteTray() override;
41 41
42 // ActionableView: 42 // ActionableView:
43 bool PerformAction(const ui::Event& event) override; 43 bool PerformAction(const ui::Event& event) override;
44 44
45 // SessionStateObserver: 45 // SessionStateObserver:
46 void SessionStateChanged(SessionStateDelegate::SessionState state) override; 46 void SessionStateChanged(SessionStateDelegate::SessionState state) override;
47 47
48 // ShellObserver:
49 void OnLockStateChanged(bool locked) override;
50
48 // TrayBackgroundView: 51 // TrayBackgroundView:
49 void ClickedOutsideBubble() override; 52 void ClickedOutsideBubble() override;
50 base::string16 GetAccessibleNameForTray() override; 53 base::string16 GetAccessibleNameForTray() override;
51 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 54 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
52 void SetShelfAlignment(ShelfAlignment alignment) override; 55 void SetShelfAlignment(ShelfAlignment alignment) override;
53 void AnchorUpdated() override; 56 void AnchorUpdated() override;
54 57
55 // PaletteToolManager::Delegate: 58 // PaletteToolManager::Delegate:
56 void HidePalette() override; 59 void HidePalette() override;
57 60
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 views::ImageView* icon_; 111 views::ImageView* icon_;
109 112
110 base::WeakPtrFactory<PaletteTray> weak_factory_; 113 base::WeakPtrFactory<PaletteTray> weak_factory_;
111 114
112 DISALLOW_COPY_AND_ASSIGN(PaletteTray); 115 DISALLOW_COPY_AND_ASSIGN(PaletteTray);
113 }; 116 };
114 117
115 } // namespace ash 118 } // namespace ash
116 119
117 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_ 120 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698