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

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

Issue 10384217: Add left/right layout support for uber tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « no previous file | ash/system/tray/system_tray.cc » ('j') | ash/system/tray/system_tray.cc » ('J')
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 24e8257e3ef94eaddda38f23ea5fc1d267c9417d..129179f1235a683da259fe9ee873162264564fd5 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -10,6 +10,7 @@
#include "ash/ash_export.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"
@@ -144,6 +145,9 @@ class ASH_EXPORT SystemTray : public internal::ActionableView,
// Returns true if the bubble exists.
bool CloseBubbleForTest() const;
+ void SetAlignment(ShelfAlignment alignment);
+ ShelfAlignment GetAlignment() const;
+
private:
friend class internal::SystemTrayLayerAnimationObserver;
friend class internal::SystemTrayBubble;
@@ -229,6 +233,9 @@ class ASH_EXPORT SystemTray : public internal::ActionableView,
// See description agove getter.
bool should_show_launcher_;
+ // Shelf alignment.
+ ShelfAlignment shelf_alignment_;
+
internal::BackgroundAnimator hide_background_animator_;
internal::BackgroundAnimator hover_background_animator_;
scoped_ptr<internal::SystemTrayLayerAnimationObserver>
« no previous file with comments | « no previous file | ash/system/tray/system_tray.cc » ('j') | ash/system/tray/system_tray.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698