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

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

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/tray_background_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_background_view.cc
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
index 8372fcf92559d6ec1cc292149f63ad23c1fe55ab..22a5d0cfeac4822a60b61051965944b8ef2c89c2 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -54,11 +54,12 @@ class TrayBackground : public views::Background {
// TrayBackgroundView
TrayBackgroundView::TrayBackgroundView()
- : background_(NULL),
- ALLOW_THIS_IN_INITIALIZER_LIST(hide_background_animator_(
- this, 0, kTrayBackgroundAlpha)),
- ALLOW_THIS_IN_INITIALIZER_LIST(hover_background_animator_(
- this, 0, kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha)) {
+ : shelf_alignment_(SHELF_ALIGNMENT_BOTTOM),
+ background_(NULL),
+ ALLOW_THIS_IN_INITIALIZER_LIST(hide_background_animator_(
+ this, 0, kTrayBackgroundAlpha)),
+ ALLOW_THIS_IN_INITIALIZER_LIST(hover_background_animator_(
+ this, 0, kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha)) {
set_border(views::Border::CreateEmptyBorder(0, 0,
kPaddingFromBottomOfScreenBottomAlignment,
kPaddingFromRightEdgeOfScreenBottomAlignment));
@@ -109,5 +110,9 @@ void TrayBackgroundView::SetPaintsBackground(
hide_background_animator_.SetPaintsBackground(value, change_type);
}
+void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
+ shelf_alignment_ = alignment;
+}
+
} // namespace internal
} // namespace ash
« no previous file with comments | « ash/system/tray/tray_background_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698