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

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

Issue 10535112: Prepare status area to support multiple trays. (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/tray/system_tray_unittest.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_background_view.h
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index b1233fdbd33278efa04f9750f4741ec12afe57c5..3e6e6d29c2e881ccbd772ee1c211f67db10a5a12 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -9,6 +9,7 @@
#include "ash/ash_export.h"
#include "ash/launcher/background_animator.h"
#include "ash/system/tray/tray_views.h"
+#include "ash/wm/shelf_auto_hide_behavior.h"
namespace ash {
namespace internal {
@@ -36,6 +37,9 @@ class ASH_EXPORT TrayBackgroundView : public internal::ActionableView,
// Overridden from internal::BackgroundAnimatorDelegate.
virtual void UpdateBackground(int alpha) OVERRIDE;
+ // Called whenever the shelf alignment changes.
+ virtual void SetShelfAlignment(ShelfAlignment alignment);
+
// Sets |contents| as a child and sets its background to |background_|.
void SetContents(views::View* contents);
@@ -45,7 +49,12 @@ class ASH_EXPORT TrayBackgroundView : public internal::ActionableView,
bool value,
internal::BackgroundAnimator::ChangeType change_type);
+ ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
+
private:
+ // Shelf alignment.
+ ShelfAlignment shelf_alignment_;
+
// Owned by the view passed to SetContents().
internal::TrayBackground* background_;
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698