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

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

Issue 2825383003: Fix stylus tools palette. (Closed)
Patch Set: Fix nits. 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
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/system/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_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 15 matching lines...) Expand all
26 class Widget; 26 class Widget;
27 } 27 }
28 28
29 namespace ash { 29 namespace ash {
30 30
31 class TrayBubbleWrapper; 31 class TrayBubbleWrapper;
32 class PaletteToolManager; 32 class PaletteToolManager;
33 33
34 // The PaletteTray shows the palette in the bottom area of the screen. This 34 // The PaletteTray shows the palette in the bottom area of the screen. This
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. 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 class ASH_EXPORT PaletteTray : public TrayBackgroundView, 38 class ASH_EXPORT PaletteTray : public TrayBackgroundView,
38 public SessionObserver, 39 public SessionObserver,
39 public ShellObserver, 40 public ShellObserver,
40 public PaletteToolManager::Delegate, 41 public PaletteToolManager::Delegate,
41 public ui::InputDeviceEventObserver, 42 public ui::InputDeviceEventObserver,
42 public views::TrayBubbleView::Delegate { 43 public views::TrayBubbleView::Delegate {
43 public: 44 public:
44 explicit PaletteTray(WmShelf* wm_shelf); 45 explicit PaletteTray(WmShelf* wm_shelf);
45 ~PaletteTray() override; 46 ~PaletteTray() override;
46 47
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 ScopedSessionObserver scoped_session_observer_; 128 ScopedSessionObserver scoped_session_observer_;
128 129
129 base::WeakPtrFactory<PaletteTray> weak_factory_; 130 base::WeakPtrFactory<PaletteTray> weak_factory_;
130 131
131 DISALLOW_COPY_AND_ASSIGN(PaletteTray); 132 DISALLOW_COPY_AND_ASSIGN(PaletteTray);
132 }; 133 };
133 134
134 } // namespace ash 135 } // namespace ash
135 136
136 #endif // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_ 137 #endif // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
OLDNEW
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/system/palette/palette_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698