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

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

Issue 2535773004: Make sure stylus tools are always hidden if disabled by the user. (Closed)
Patch Set: Created 4 years 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 palette_enabled_subscription_; 117 palette_enabled_subscription_;
118 118
119 // Weak pointer, will be parented by TrayContainer for its lifetime. 119 // Weak pointer, will be parented by TrayContainer for its lifetime.
120 views::ImageView* icon_; 120 views::ImageView* icon_;
121 121
122 // The shelf auto-hide state is checked during the tray constructor, so we 122 // The shelf auto-hide state is checked during the tray constructor, so we
123 // have to use a helper variable instead of just checking if we have a tray 123 // have to use a helper variable instead of just checking if we have a tray
124 // instance. 124 // instance.
125 bool should_block_shelf_auto_hide_ = false; 125 bool should_block_shelf_auto_hide_ = false;
126 126
127 // True if the user has disabled the palette.
stevenjb 2016/11/28 18:47:26 s/True/False/ ?
jdufault 2016/11/28 19:07:47 Done.
128 bool is_palette_enabled_ = true;
129
127 // Used to indicate whether the palette bubble is automatically opened by a 130 // Used to indicate whether the palette bubble is automatically opened by a
128 // stylus eject event. 131 // stylus eject event.
129 bool is_bubble_auto_opened_ = false; 132 bool is_bubble_auto_opened_ = false;
130 133
131 // Number of actions in pen palette bubble. 134 // Number of actions in pen palette bubble.
132 int num_actions_in_bubble_ = 0; 135 int num_actions_in_bubble_ = 0;
133 136
134 base::WeakPtrFactory<PaletteTray> weak_factory_; 137 base::WeakPtrFactory<PaletteTray> weak_factory_;
135 138
136 DISALLOW_COPY_AND_ASSIGN(PaletteTray); 139 DISALLOW_COPY_AND_ASSIGN(PaletteTray);
137 }; 140 };
138 141
139 } // namespace ash 142 } // namespace ash
140 143
141 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_ 144 #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