Experimental launcher: Switcher buttons are larger and centered.

ui/app_list/views/app_list_view_unittest.cc

 // Copyright 2014 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 "ui/app_list/views/app_list_view.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 221 matching lines @@
   return view_->GetAppsPaginationModel();
 }
 
 void AppListViewTestContext::RunDisplayTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
   delegate_->GetTestModel()->PopulateApps(kInitialItems);
 
   Show();
 
-  // The landscape app launcher needs to be short enough to accomodate the
-  // virtual keyboard because it is enabled by default when the virtual keyboard
-  // is enabled.
-  if (test_type_ == LANDSCAPE)
-    EXPECT_GE(403, view_->bounds().height());
+  // Explicitly enforce the exact dimensions of the app list. Feel free to
+  // change these if you need to (they are just here to prevent against
+  // accidental changes to the window size).
+  switch (test_type_) {
+    case NORMAL:
+      EXPECT_EQ("400x500", view_->bounds().size().ToString());
+      break;
+    case LANDSCAPE:
+      // NOTE: Height should exceed 402, because otherwise there might not be

[calamity, 2014/09/22 03:50:45]

'should not'?

[Matt Giuca, 2014/09/22 04:00:45]

Done.

+      // enough space to accomodate the virtual keyboard. (LANDSCAPE mode is
+      // enabled by default when the virtual keyboard is enabled.)
+      EXPECT_EQ("576x402", view_->bounds().size().ToString());
+      break;
+    case EXPERIMENTAL:
+      EXPECT_EQ("768x560", view_->bounds().size().ToString());
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
 
   if (is_landscape())
     EXPECT_EQ(2, GetPaginationModel()->total_pages());
   else
     EXPECT_EQ(3, GetPaginationModel()->total_pages());
   EXPECT_EQ(0, GetPaginationModel()->selected_page());
 
   // Checks on the main view.
   AppListMainView* main_view = view_->app_list_main_view();
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view));
@@ skipping 436 matching lines @@
 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance,
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list