Add left/right layout support for uber tray.

ash/system/tray/system_tray.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/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
@@ skipping 150 matching lines @@
       clock_observer_(NULL),
       drive_observer_(NULL),
       ime_observer_(NULL),
       network_observer_(NULL),
       power_status_observer_(NULL),
       update_observer_(NULL),
       user_observer_(NULL),
       widget_(NULL),
       background_(new internal::SystemTrayBackground),
       should_show_launcher_(false),
+      shelf_alignment_(SHELF_ALIGNMENT_BOTTOM),
       ALLOW_THIS_IN_INITIALIZER_LIST(hide_background_animator_(this,
           0, kTrayBackgroundAlpha)),
       ALLOW_THIS_IN_INITIALIZER_LIST(hover_background_animator_(this,
           0, kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha)) {
   tray_container_ = new internal::SystemTrayContainer;
   tray_container_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, 0));
   tray_container_->set_background(background_);
   tray_container_->set_border(
       views::Border::CreateEmptyBorder(1, 1, 1, 1));
   set_border(views::Border::CreateEmptyBorder(0, 0,
-        kPaddingFromBottomOfScreen, kPaddingFromRightEdgeOfScreen));
+        kPaddingFromBottomOfScreenBottomAlignment,
+        kPaddingFromRightEdgeOfScreenBottomAlignment));
   set_notify_enter_exit_on_child(true);
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(tray_container_);
 
   // Initially we want to paint the background, but without the hover effect.
   SetPaintsBackground(true, internal::BackgroundAnimator::CHANGE_IMMEDIATE);
   hover_background_animator_.SetPaintsBackground(false,
       internal::BackgroundAnimator::CHANGE_IMMEDIATE);
 }
 
@@ skipping 278 matching lines @@
 }
 
 void SystemTray::UpdateNotificationAnchor() {
   if (!notification_bubble_.get())
     return;
   notification_bubble_->bubble_view()->UpdateAnchor();
   // Ensure that the notification buble is above the launcher/status area.
   notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
 }
 
+void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
+  if (alignment == shelf_alignment_)
+    return;
+
+  if (alignment == SHELF_ALIGNMENT_BOTTOM){
+    tray_container_->SetLayoutManager(new views::BoxLayout(
+        views::BoxLayout::kHorizontal, 0, 0, 0));
+  }  else if (alignment == SHELF_ALIGNMENT_LEFT ||

[sadrul, 2012/05/17 23:30:29]

two many spaces here

[jennyz, 2012/05/18 00:00:42]

Done.

+              alignment == SHELF_ALIGNMENT_RIGHT) {
+    if (shelf_alignment_ == SHELF_ALIGNMENT_BOTTOM)
+        tray_container_->SetLayoutManager(new views::BoxLayout(
+            views::BoxLayout::kVertical, 0, 0, 0));
+  }

[sadrul, 2012/05/17 23:30:29]

I think this could just be:

 tray_container_->SetLayoutManager(new views::BoxLayout(
    alignment == SHELF_ALIGNMENT_BOTTOM ? kHorizontal : kVertical,
    0, 0, 0));

[jennyz, 2012/05/18 00:00:42]

Done. I was trying to save a little for switching between left/right, since it
does not need to change layout manager. But this probably is not a big deal and
the code looks cleaner regardless, changed.

+  shelf_alignment_ = alignment;
+}
+
 bool SystemTray::PerformAction(const views::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
   // (and hide any popup that's currently shown).
   if (bubble_.get() &&
       bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DEFAULT) {
     bubble_->Close();
   } else {
     int arrow_offset = -1;
     if (event.IsMouseEvent() || event.IsTouchEvent()) {
       const views::LocatedEvent& located_event =
           static_cast<const views::LocatedEvent&>(event);
-      arrow_offset = base::i18n::IsRTL() ?
-          located_event.x() : tray_container_->width() - located_event.x();
+      if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM)
+        arrow_offset = base::i18n::IsRTL() ?
+            located_event.x() : tray_container_->width() - located_event.x();
+      else
+        arrow_offset = tray_container_->height() - located_event.y();
     }
     ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
   }
   return true;
 }
 
 void SystemTray::OnMouseEntered(const views::MouseEvent& event) {
   should_show_launcher_ = true;
   hover_background_animator_.SetPaintsBackground(true,
       internal::BackgroundAnimator::CHANGE_ANIMATE);
@@ skipping 27 matching lines @@
     canvas->DrawFocusRect(tray_container_->bounds());
 }
 
 void SystemTray::UpdateBackground(int alpha) {
   background_->set_alpha(hide_background_animator_.alpha() +
                          hover_background_animator_.alpha());
   SchedulePaint();
 }
 
 }  // namespace ash