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

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

Issue 10514008: Add WebNotificationTray (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 6 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
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 650799ae780f78964065c9a01fd937ddc6a11302..26d4c051b5e0177f7c1a3ff4bb9f001264f4a4e3 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -10,7 +10,6 @@
#include "ash/system/tray/tray_background_view.h"
#include "ash/system/tray/tray_views.h"
#include "ash/system/user/login_status.h"
-#include "ash/wm/shelf_auto_hide_behavior.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
@@ -96,6 +95,12 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// Updates the items when the shelf alignment changes.
void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment);
+ // Temporarily hides/unhides the notification bubble.
+ void SetHideNotifications(bool hidden);
+
+ // Returns true if the primary bubble is visible.
+ bool IsBubbleVisible() const;
+
// Returns true if the launcher should show.
bool should_show_launcher() const {
return bubble_.get() && should_show_launcher_;
@@ -146,8 +151,8 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// Returns true if the bubble exists.
bool CloseBubbleForTest() const;
- void SetShelfAlignment(ShelfAlignment alignment);
- ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
+ // Overridden from TrayBackgroundView.
+ virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
private:
friend class internal::SystemTrayLayerAnimationObserver;
@@ -234,9 +239,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// See description agove getter.
bool should_show_launcher_;
- // Shelf alignment.
- ShelfAlignment shelf_alignment_;
-
scoped_ptr<internal::SystemTrayLayerAnimationObserver>
layer_animation_observer_;
@@ -244,6 +246,10 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// views directly (e.g. from a notification) we know what height to use.
int default_bubble_height_;
+ // Set to true when system notifications should be hidden (e.g. web
+ // notification bubble is visible).
+ bool hide_notifications_;
+
DISALLOW_COPY_AND_ASSIGN(SystemTray);
};
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698