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

Unified Diff: ash/system/tray/system_tray.h

Issue 10836227: Fix status area accessability issues. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index d27bbc5ebc339a911334f865e89a661781a797d5..3a104c599c62eb797412f93ad7b6b4de9659d126 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -41,7 +41,6 @@ class SystemTrayItem;
namespace internal {
class SystemTrayBubble;
class SystemTrayContainer;
-class SystemTrayLayerAnimationObserver;
}
// There are different methods for creating bubble views.
@@ -55,9 +54,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
explicit SystemTray(internal::StatusAreaWidget* status_area_widget);
virtual ~SystemTray();
- // Called after the tray has been added to the widget containing it.
- void Initialize();
-
// Creates the default set of items for the sytem tray.
void CreateItems();
@@ -99,13 +95,14 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// Temporarily hides/unhides the notification bubble.
void SetHideNotifications(bool hidden);
+ // Returns true if the system bubble is visible.
+ bool IsSystemBubbleVisible() const;
+
// Returns true if any bubble is visible.
bool IsAnyBubbleVisible() const;
- // Returns true if the launcher should show.
- bool should_show_launcher() const {
- return bubble_.get() && should_show_launcher_;
- }
+ // Returns true if the mouse is inside the notification bubble.
+ bool IsMouseInNotificationBubble() const;
AccessibilityObserver* accessibility_observer() const {
return accessibility_observer_;
@@ -157,9 +154,10 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// Overridden from TrayBackgroundView.
virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
+ virtual void AnchorUpdated() OVERRIDE;
+ virtual string16 GetAccessibleName() OVERRIDE;
private:
- friend class internal::SystemTrayLayerAnimationObserver;
friend class internal::SystemTrayBubble;
// Resets |bubble_| and clears any related state.
@@ -191,19 +189,9 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// |notification_items_|, or destroys it if there are no notification items.
void UpdateNotificationBubble();
- // Called when the anchor (tray or bubble) may have moved or changed.
- void UpdateNotificationAnchor();
-
// Overridden from internal::ActionableView.
virtual bool PerformAction(const ui::Event& event) OVERRIDE;
- // Overridden from views::View.
- virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
- virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
- virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
- virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
- virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
-
// Owned items.
ScopedVector<SystemTrayItem> items_;
@@ -236,12 +224,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// Bubble for notifications.
scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
- // See description agove getter.
- bool should_show_launcher_;
-
- scoped_ptr<internal::SystemTrayLayerAnimationObserver>
- layer_animation_observer_;
-
// Keep track of the default view height so that when we create detailed
// views directly (e.g. from a notification) we know what height to use.
int default_bubble_height_;

Powered by Google App Engine
This is Rietveld 408576698