Fixing the gdrive sync item alignment to keep it centered.

ash/system/tray/tray_item_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray/tray_item_view.h"
 
 #include "ash/shelf/shelf_types.h"
+#include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kTrayIconHeight = 29;
 const int kTrayIconWidth = 29;
 const int kTrayItemAnimationDurationMS = 200;
 
 // Animations can be disabled for testing.
 bool animations_enabled = true;
 }
 
 namespace ash {
 namespace internal {
 
 TrayItemView::TrayItemView(SystemTrayItem* owner)
     : owner_(owner),
       label_(NULL),
-      image_view_(NULL) {
+      image_view_(NULL),
+      alignment_override_(AUTO) {
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(false);
-  SetLayoutManager(
-      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
+  SetLayoutAlignment();
+  // Observe any shelf alignment changes to change view alignments.
+  if (ash::Shell::HasInstance())
+    ash::Shell::GetInstance()->AddShellObserver(this);
 }
 
-TrayItemView::~TrayItemView() {}
+TrayItemView::~TrayItemView() {
+  if (ash::Shell::HasInstance())
+    ash::Shell::GetInstance()->RemoveShellObserver(this);
+}
 
 // static
 void TrayItemView::DisableAnimationsForTest() {
   animations_enabled = false;
 }
 
 void TrayItemView::CreateLabel() {
   label_ = new views::Label;
   AddChildView(label_);
 }
 
 void TrayItemView::CreateImageView() {
   image_view_ = new views::ImageView;
   AddChildView(image_view_);
 }
 
+void TrayItemView::SetAlignmentOverride(AlignmentOverride alignment_override) {
+  alignment_override_ = alignment_override;
+  SetLayoutAlignment();
+}
+
 void TrayItemView::SetVisible(bool set_visible) {
   if (!GetWidget() || !animations_enabled) {
     views::View::SetVisible(set_visible);
     return;
   }
 
   if (!animation_) {
     animation_.reset(new ui::SlideAnimation(this));
     animation_->SetSlideDuration(GetAnimationDurationMS());
     animation_->SetTweenType(ui::Tween::LINEAR);
@@ skipping 29 matching lines @@
     return size;
   size.set_width(std::max(1,
       static_cast<int>(size.width() * animation_->GetCurrentValue())));
   return size;
 }
 
 int TrayItemView::GetHeightForWidth(int width) {
   return GetPreferredSize().height();
 }
 
+void TrayItemView::OnShelfAlignmentChanged(
+    aura::RootWindow* root_window) {
+  SetLayoutAlignment();
+}
+
 void TrayItemView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
 void TrayItemView::AnimationProgressed(const ui::Animation* animation) {
   gfx::Transform transform;
   transform.Translate(0, animation->CurrentValueBetween(
       static_cast<double>(height()) / 2, 0.));
   transform.Scale(animation->GetCurrentValue(),
                   animation->GetCurrentValue());
   layer()->SetTransform(transform);
   PreferredSizeChanged();
 }
 
 void TrayItemView::AnimationEnded(const ui::Animation* animation) {
   if (animation->GetCurrentValue() < 0.1)
     views::View::SetVisible(false);
 }
 
 void TrayItemView::AnimationCanceled(const ui::Animation* animation) {
   AnimationEnded(animation);
 }
 
+void TrayItemView::SetLayoutAlignment() {
+  views::BoxLayout::Orientation alignment = views::BoxLayout::kHorizontal;
+  switch (alignment_override_) {
+    case AUTO:
+      switch (owner()->system_tray()->shelf_alignment()) {
+        case ash::SHELF_ALIGNMENT_BOTTOM:
+        case ash::SHELF_ALIGNMENT_TOP:
+          alignment = views::BoxLayout::kHorizontal;
+          break;
+        case ash::SHELF_ALIGNMENT_LEFT:
+        case ash::SHELF_ALIGNMENT_RIGHT:
+          alignment = views::BoxLayout::kVertical;
+          break;
+      }
+      break;
+    case HORIZONTAL:
+      alignment = views::BoxLayout::kHorizontal;
+      break;
+    case VERTICAL:
+      alignment = views::BoxLayout::kVertical;
+      break;
+  }
+  SetLayoutManager(new views::BoxLayout(alignment, 0, 0, 0));
+  Layout();
+}
+
 }  // namespace internal
 }  // namespace ash