Add left/right layout support for uber tray.

ash/wm/shelf_layout_manager_unittest.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/focus_cycler.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
+#include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/animation_container_element.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
@@ skipping 477 matching lines @@
   const aura::MonitorManager* manager =
       aura::Env::GetInstance()->monitor_manager();
   gfx::Monitor monitor =
       manager->GetMonitorNearestWindow(Shell::GetRootWindow());
   ASSERT_NE(-1, monitor.id());
   EXPECT_EQ(shelf->GetIdealBounds().width(),
             monitor.GetWorkAreaInsets().left());
   EXPECT_GE(
       launcher_bounds.width(),
       shelf->launcher_widget()->GetContentsView()->GetPreferredSize().width());
+  EXPECT_EQ(SHELF_ALIGNMENT_LEFT,
+            Shell::GetInstance()->tray()->shelf_alignment());
+  gfx::Rect status_bounds(shelf->status()->GetWindowScreenBounds());
+  EXPECT_GE(status_bounds.width(),
+            shelf->status()->GetContentsView()->GetPreferredSize().width());
   EXPECT_EQ(shelf->GetIdealBounds().width(),
             monitor.GetWorkAreaInsets().left());
   EXPECT_EQ(0, monitor.GetWorkAreaInsets().top());
   EXPECT_EQ(0, monitor.GetWorkAreaInsets().bottom());
   EXPECT_EQ(0, monitor.GetWorkAreaInsets().right());
   EXPECT_EQ(monitor.bounds().x(), launcher_bounds.x());
   EXPECT_EQ(monitor.bounds().y(), launcher_bounds.y());
   EXPECT_EQ(monitor.bounds().height(), launcher_bounds.height());
 
-
   shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
   launcher_bounds = shelf->launcher_widget()->GetWindowScreenBounds();
   monitor = manager->GetMonitorNearestWindow(Shell::GetRootWindow());
   ASSERT_NE(-1, monitor.id());
   EXPECT_EQ(shelf->GetIdealBounds().width(),
             monitor.GetWorkAreaInsets().right());
   EXPECT_GE(
       launcher_bounds.width(),
       shelf->launcher_widget()->GetContentsView()->GetPreferredSize().width());
+  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT,
+            Shell::GetInstance()->tray()->shelf_alignment());
+  status_bounds = gfx::Rect(shelf->status()->GetWindowScreenBounds());
+  EXPECT_GE(status_bounds.width(),
+            shelf->status()->GetContentsView()->GetPreferredSize().width());
   EXPECT_EQ(shelf->GetIdealBounds().width(),
             monitor.GetWorkAreaInsets().right());
   EXPECT_EQ(0, monitor.GetWorkAreaInsets().top());
   EXPECT_EQ(0, monitor.GetWorkAreaInsets().bottom());
   EXPECT_EQ(0, monitor.GetWorkAreaInsets().left());
   EXPECT_EQ(monitor.work_area().right(), launcher_bounds.x());
   EXPECT_EQ(monitor.bounds().y(), launcher_bounds.y());
   EXPECT_EQ(monitor.bounds().height(), launcher_bounds.height());
 }
 
 }  // namespace internal
 }  // namespace ash