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

Side by Side Diff: ash/system/tray/system_tray.h

Issue 380943002: Added battery level and time to the status tray's accessible name. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 (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_SYSTEM_TRAY_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/system_tray_bubble.h" 9 #include "ash/system/tray/system_tray_bubble.h"
10 #include "ash/system/tray/tray_background_view.h" 10 #include "ash/system/tray/tray_background_view.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 // Returns view for help button if default view is shown. Returns NULL 115 // Returns view for help button if default view is shown. Returns NULL
116 // otherwise. 116 // otherwise.
117 views::View* GetHelpButtonView() const; 117 views::View* GetHelpButtonView() const;
118 118
119 // Accessors for testing. 119 // Accessors for testing.
120 120
121 // Returns true if the bubble exists. 121 // Returns true if the bubble exists.
122 bool CloseNotificationBubbleForTest() const; 122 bool CloseNotificationBubbleForTest() const;
123 123
124 // Returns a string with the current time for accessiblity on the status
Daniel Erat 2014/07/09 23:10:24 nit: accessibility
evy 2014/07/10 17:19:57 Done.
125 // tray bar.
126 base::string16 GetAccessibleTimeString(const base::Time& now) const;
127
124 // Overridden from TrayBackgroundView. 128 // Overridden from TrayBackgroundView.
125 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; 129 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
126 virtual void AnchorUpdated() OVERRIDE; 130 virtual void AnchorUpdated() OVERRIDE;
127 virtual base::string16 GetAccessibleNameForTray() OVERRIDE; 131 virtual base::string16 GetAccessibleNameForTray() OVERRIDE;
128 virtual void BubbleResized(const views::TrayBubbleView* bubble_view) OVERRIDE; 132 virtual void BubbleResized(const views::TrayBubbleView* bubble_view) OVERRIDE;
129 virtual void HideBubbleWithView( 133 virtual void HideBubbleWithView(
130 const views::TrayBubbleView* bubble_view) OVERRIDE; 134 const views::TrayBubbleView* bubble_view) OVERRIDE;
131 virtual bool ClickedOutsideBubble() OVERRIDE; 135 virtual bool ClickedOutsideBubble() OVERRIDE;
132 136
133 // Overridden from message_center::TrayBubbleView::Delegate. 137 // Overridden from message_center::TrayBubbleView::Delegate.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 231
228 TrayAccessibility* tray_accessibility_; // not owned 232 TrayAccessibility* tray_accessibility_; // not owned
229 TrayDate* tray_date_; 233 TrayDate* tray_date_;
230 234
231 DISALLOW_COPY_AND_ASSIGN(SystemTray); 235 DISALLOW_COPY_AND_ASSIGN(SystemTray);
232 }; 236 };
233 237
234 } // namespace ash 238 } // namespace ash
235 239
236 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 240 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698