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

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: cleanup Created 3 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 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_SYSTEM_PALETTE_PALETTE_TRAY_H_ 5 #ifndef ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
6 #define ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_ 6 #define ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 24 matching lines...) Expand all
35 // class also controls the lifetime for all of the tools available in the 35 // class also controls the lifetime for all of the tools available in the
36 // palette. PaletteTray has one instance per-display. It is only made visible if 36 // palette. PaletteTray has one instance per-display. It is only made visible if
37 // the display is primary and if the device has stylus hardware. 37 // the display is primary and if the device has stylus hardware.
38 class ASH_EXPORT PaletteTray : public TrayBackgroundView, 38 class ASH_EXPORT PaletteTray : public TrayBackgroundView,
39 public SessionObserver, 39 public SessionObserver,
40 public ShellObserver, 40 public ShellObserver,
41 public PaletteToolManager::Delegate, 41 public PaletteToolManager::Delegate,
42 public ui::InputDeviceEventObserver, 42 public ui::InputDeviceEventObserver,
43 public views::TrayBubbleView::Delegate { 43 public views::TrayBubbleView::Delegate {
44 public: 44 public:
45 explicit PaletteTray(WmShelf* wm_shelf); 45 explicit PaletteTray(Shelf* shelf);
46 ~PaletteTray() override; 46 ~PaletteTray() override;
47 47
48 // ActionableView: 48 // ActionableView:
49 bool PerformAction(const ui::Event& event) override; 49 bool PerformAction(const ui::Event& event) override;
50 50
51 // SessionObserver: 51 // SessionObserver:
52 void OnSessionStateChanged(session_manager::SessionState state) override; 52 void OnSessionStateChanged(session_manager::SessionState state) override;
53 53
54 // ShellObserver: 54 // ShellObserver:
55 void OnLockStateChanged(bool locked) override; 55 void OnLockStateChanged(bool locked) override;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 ScopedSessionObserver scoped_session_observer_; 128 ScopedSessionObserver scoped_session_observer_;
129 129
130 base::WeakPtrFactory<PaletteTray> weak_factory_; 130 base::WeakPtrFactory<PaletteTray> weak_factory_;
131 131
132 DISALLOW_COPY_AND_ASSIGN(PaletteTray); 132 DISALLOW_COPY_AND_ASSIGN(PaletteTray);
133 }; 133 };
134 134
135 } // namespace ash 135 } // namespace ash
136 136
137 #endif // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_ 137 #endif // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698