ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

ash/shelf/shelf_widget_unittest.cc

 // Copyright (c) 2013 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/shelf/shelf_widget.h"
 
+#include "ash/ash_switches.h"

[James Cook, 2013/08/22 00:19:12]

Is this needed?

[Harry McCleave, 2013/08/27 00:37:00]

Done.

 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_view_test_api.h"
 #include "ash/wm/window_util.h"
+#include "base/command_line.h"

[James Cook, 2013/08/22 00:19:12]

Is this needed?

[Harry McCleave, 2013/08/27 00:37:00]

Done.

 #include "ui/aura/root_window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
@@ skipping 38 matching lines @@
 }
 
 TEST_F(ShelfWidgetTest, TestAlignment) {
   Launcher* launcher = Launcher::ForPrimaryDisplay();
   UpdateDisplay("400x400");
   ASSERT_TRUE(launcher);
   {
     SCOPED_TRACE("Single Bottom");
     TestLauncherAlignment(Shell::GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_BOTTOM,
-                          "0,0 400x352");
+                          "0,0 400x353");
   }
   {
     SCOPED_TRACE("Single Right");
     TestLauncherAlignment(Shell::GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_RIGHT,
-                          "0,0 352x400");
+                          "0,0 353x400");
   }
   {
     SCOPED_TRACE("Single Left");
     TestLauncherAlignment(Shell::GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_LEFT,
-                          "48,0 352x400");
+                          "47,0 353x400");
   }
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("300x300,500x500");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   {
     SCOPED_TRACE("Primary Bottom");
     TestLauncherAlignment(root_windows[0],
                           SHELF_ALIGNMENT_BOTTOM,
-                          "0,0 300x252");
+                          "0,0 300x253");
   }
   {
     SCOPED_TRACE("Primary Right");
     TestLauncherAlignment(root_windows[0],
                           SHELF_ALIGNMENT_RIGHT,
-                          "0,0 252x300");
+                          "0,0 253x300");
   }
   {
     SCOPED_TRACE("Primary Left");
     TestLauncherAlignment(root_windows[0],
                           SHELF_ALIGNMENT_LEFT,
-                          "48,0 252x300");
+                          "47,0 253x300");
   }
   {
     SCOPED_TRACE("Secondary Bottom");
     TestLauncherAlignment(root_windows[1],
                           SHELF_ALIGNMENT_BOTTOM,
-                          "300,0 500x452");
+                          "300,0 500x453");
   }
   {
     SCOPED_TRACE("Secondary Right");
     TestLauncherAlignment(root_windows[1],
                           SHELF_ALIGNMENT_RIGHT,
-                          "300,0 452x500");
+                          "300,0 453x500");
   }
   {
     SCOPED_TRACE("Secondary Left");
     TestLauncherAlignment(root_windows[1],
                           SHELF_ALIGNMENT_LEFT,
-                          "348,0 452x500");
+                          "347,0 453x500");
   }
 }
 
 // Makes sure the launcher is initially sized correctly.
 TEST_F(ShelfWidgetTest, LauncherInitiallySized) {
   ShelfWidget* shelf_widget = GetShelfWidget();
   Launcher* launcher = shelf_widget->launcher();
   ASSERT_TRUE(launcher);
   internal::ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManager();
   ASSERT_TRUE(shelf_layout_manager);
@@ skipping 47 matching lines @@
   const int status_width =
       shelf->status_area_widget()->GetWindowBoundsInScreen().width();
   EXPECT_GT(status_width, 0);
   EXPECT_EQ(status_width,
             shelf->GetContentsView()->width() -
                 launcher->GetLauncherViewForTest()->width());
 }
 #endif
 
 }  // namespace ash