Add left/right layout support for uber tray.

ash/wm/shelf_layout_manager.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/wm/shelf_layout_manager.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 175 matching lines @@
   LayoutShelf();
 }
 
 void ShelfLayoutManager::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
 
   alignment_ = alignment;
   if (launcher_)
     launcher_->SetAlignment(alignment);
+  if (Shell::GetInstance()->tray())
+    Shell::GetInstance()->tray()->SetShelfAlignment(alignment);
   LayoutShelf();
 }
 
 gfx::Rect ShelfLayoutManager::GetIdealBounds() {
   // TODO: this is wrong. Figure out what monitor shelf is on and everything
   // should be based on it.
   gfx::Rect bounds(
       gfx::Screen::GetMonitorNearestWindow(status_->GetNativeView()).bounds());
   int width = 0, height = 0;
   GetShelfSize(&width, &height);
@@ skipping 182 matching lines @@
   if (launcher_widget())
     GetLayer(launcher_widget())->GetAnimator()->StopAnimating();
   GetLayer(status_)->GetAnimator()->StopAnimating();
 }
 
 void ShelfLayoutManager::GetShelfSize(int* width, int* height) {
   *width = *height = 0;
   gfx::Rect status_bounds(status_->GetWindowScreenBounds());
   gfx::Size launcher_size = launcher_ ?
       launcher_widget()->GetContentsView()->GetPreferredSize() : gfx::Size();
-  if (alignment_ == SHELF_ALIGNMENT_BOTTOM) {
+  if (alignment_ == SHELF_ALIGNMENT_BOTTOM)
     *height = std::max(launcher_size.height(), status_bounds.height());
-  } else {
-    // TODO: include status when supports alignment.
-    *width = launcher_size.width();
-  }
+  else
+    *width = std::max(launcher_size.width(), status_bounds.width());
 }
 
 void ShelfLayoutManager::AdjustBoundsBasedOnAlignment(int inset,
                                                       gfx::Rect* bounds) const {
   switch (alignment_) {
     case SHELF_ALIGNMENT_BOTTOM:
       bounds->Inset(gfx::Insets(0, 0, inset, 0));
       break;
     case SHELF_ALIGNMENT_LEFT:
       bounds->Inset(gfx::Insets(0, inset, 0, 0));
@@ skipping 153 matching lines @@
 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const {
   if (state.visibility_state == VISIBLE)
     return size;
   if (state.visibility_state == AUTO_HIDE)
     return kAutoHideSize;
   return 0;
 }
 
 }  // namespace internal
 }  // namespace ash