Refactor: Shelf Widget

ash/system/tray/system_tray_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/system/tray/system_tray.h"
 
 #include <vector>
 
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/test/ash_test_base.h"
 #include "base/utf_string_conversions.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace ash {
 namespace test {
 
 namespace {
 
 SystemTray* GetSystemTray() {
-  return Shell::GetPrimaryRootWindowController()->status_area_widget()->
-      system_tray();
+  return Shell::GetPrimaryRootWindowController()->shelf()->
+      status_area_widget()->system_tray();
 }
 
 // Trivial item implementation that tracks its views for testing.
 class TestItem : public SystemTrayItem {
  public:
   TestItem() : SystemTrayItem(GetSystemTray()), tray_view_(NULL) {}
 
   virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE {
     tray_view_ = new views::View;
     // Add a label so it has non-zero width.
@@ skipping 240 matching lines @@
 
   EXPECT_EQ(bubble_bounds.ToString(), test_item->default_view()->GetWidget()->
       GetWindowBoundsInScreen().ToString());
   EXPECT_EQ(widget, test_item->default_view()->GetWidget());
 }
 
 // Tests that the tray is laid out properly in the widget to make sure that the
 // tray extends to the correct edge of the screen.
 TEST_F(SystemTrayTest, TrayBoundsInWidget) {
   internal::StatusAreaWidget* widget =
-      Shell::GetPrimaryRootWindowController()->status_area_widget();
+      Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget();
   SystemTray* tray = widget->system_tray();
 
   // Test in bottom alignment. Bottom and right edges of the view should be
   // aligned with the widget.
   widget->SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM);
   gfx::Rect window_bounds = widget->GetWindowBoundsInScreen();
   gfx::Rect tray_bounds = tray->GetBoundsInScreen();
   EXPECT_EQ(window_bounds.bottom(), tray_bounds.bottom());
   EXPECT_EQ(window_bounds.right(), tray_bounds.right());
 
@@ skipping 14 matching lines @@
   // Test in the right alignment. Right and bottom edges should match.
   widget->SetShelfAlignment(SHELF_ALIGNMENT_LEFT);
   window_bounds = widget->GetWindowBoundsInScreen();
   tray_bounds = tray->GetBoundsInScreen();
   EXPECT_EQ(window_bounds.bottom(), tray_bounds.bottom());
   EXPECT_EQ(window_bounds.right(), tray_bounds.right());
 }
 
 }  // namespace test
 }  // namespace ash