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

Side by Side Diff: ash/system/tray_accessibility.h

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 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 | « ash/system/tray/tray_popup_label_button_border.h ('k') | ash/system/tray_accessibility.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_TRAY_ACCESSIBILITY_H_ 5 #ifndef ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
6 #define ASH_SYSTEM_TRAY_ACCESSIBILITY_H_ 6 #define ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
7 7
8 #include <stdint.h>
9
8 #include "ash/accessibility_delegate.h" 10 #include "ash/accessibility_delegate.h"
9 #include "ash/shell_observer.h" 11 #include "ash/shell_observer.h"
10 #include "ash/system/tray/tray_details_view.h" 12 #include "ash/system/tray/tray_details_view.h"
11 #include "ash/system/tray/tray_image_item.h" 13 #include "ash/system/tray/tray_image_item.h"
12 #include "ash/system/tray/tray_notification_view.h" 14 #include "ash/system/tray/tray_notification_view.h"
13 #include "ash/system/tray/view_click_listener.h" 15 #include "ash/system/tray/view_click_listener.h"
16 #include "base/macros.h"
14 #include "ui/gfx/font.h" 17 #include "ui/gfx/font.h"
15 #include "ui/views/controls/button/button.h" 18 #include "ui/views/controls/button/button.h"
16 19
17 namespace chromeos { 20 namespace chromeos {
18 class TrayAccessibilityTest; 21 class TrayAccessibilityTest;
19 } 22 }
20 23
21 namespace views { 24 namespace views {
22 class Button; 25 class Button;
23 class ImageView; 26 class ImageView;
(...skipping 12 matching lines...) Expand all
36 // Notifies when accessibility mode changes. 39 // Notifies when accessibility mode changes.
37 virtual void OnAccessibilityModeChanged( 40 virtual void OnAccessibilityModeChanged(
38 ui::AccessibilityNotificationVisibility notify) = 0; 41 ui::AccessibilityNotificationVisibility notify) = 0;
39 }; 42 };
40 43
41 44
42 namespace tray { 45 namespace tray {
43 46
44 class AccessibilityPopupView : public TrayNotificationView { 47 class AccessibilityPopupView : public TrayNotificationView {
45 public: 48 public:
46 AccessibilityPopupView(SystemTrayItem* owner, uint32 enabled_state_bits); 49 AccessibilityPopupView(SystemTrayItem* owner, uint32_t enabled_state_bits);
47 50
48 const views::Label* label_for_test() const { return label_; } 51 const views::Label* label_for_test() const { return label_; }
49 52
50 private: 53 private:
51 views::Label* CreateLabel(uint32 enabled_state_bits); 54 views::Label* CreateLabel(uint32_t enabled_state_bits);
52 55
53 views::Label* label_; 56 views::Label* label_;
54 57
55 DISALLOW_COPY_AND_ASSIGN(AccessibilityPopupView); 58 DISALLOW_COPY_AND_ASSIGN(AccessibilityPopupView);
56 }; 59 };
57 60
58 class AccessibilityDetailedView : public TrayDetailsView, 61 class AccessibilityDetailedView : public TrayDetailsView,
59 public ViewClickListener, 62 public ViewClickListener,
60 public views::ButtonListener, 63 public views::ButtonListener,
61 public ShellObserver { 64 public ShellObserver {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 // Overridden from AccessibilityObserver. 126 // Overridden from AccessibilityObserver.
124 void OnAccessibilityModeChanged( 127 void OnAccessibilityModeChanged(
125 ui::AccessibilityNotificationVisibility notify) override; 128 ui::AccessibilityNotificationVisibility notify) override;
126 129
127 views::View* default_; 130 views::View* default_;
128 tray::AccessibilityPopupView* detailed_popup_; 131 tray::AccessibilityPopupView* detailed_popup_;
129 tray::AccessibilityDetailedView* detailed_menu_; 132 tray::AccessibilityDetailedView* detailed_menu_;
130 133
131 // Bitmap of fvalues from AccessibilityState. Can contain any or 134 // Bitmap of fvalues from AccessibilityState. Can contain any or
132 // both of A11Y_SPOKEN_FEEDBACK A11Y_BRAILLE_DISPLAY_CONNECTED. 135 // both of A11Y_SPOKEN_FEEDBACK A11Y_BRAILLE_DISPLAY_CONNECTED.
133 uint32 request_popup_view_state_; 136 uint32_t request_popup_view_state_;
134 137
135 bool tray_icon_visible_; 138 bool tray_icon_visible_;
136 user::LoginStatus login_; 139 user::LoginStatus login_;
137 140
138 // Bitmap of values from AccessibilityState enum. 141 // Bitmap of values from AccessibilityState enum.
139 uint32 previous_accessibility_state_; 142 uint32_t previous_accessibility_state_;
140 143
141 // A11y feature status on just entering the lock screen. 144 // A11y feature status on just entering the lock screen.
142 bool show_a11y_menu_on_lock_screen_; 145 bool show_a11y_menu_on_lock_screen_;
143 146
144 friend class chromeos::TrayAccessibilityTest; 147 friend class chromeos::TrayAccessibilityTest;
145 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility); 148 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility);
146 }; 149 };
147 150
148 } // namespace ash 151 } // namespace ash
149 152
150 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_ 153 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_popup_label_button_border.h ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698