Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1)

chrome/browser/about_flags.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 "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 943 matching lines @@
   },
   {
     "disable-touch-adjustment",
     IDS_DISABLE_TOUCH_ADJUSTMENT_NAME,
     IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION,
     kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment)
   },
 #if defined(OS_CHROMEOS)
   {
+      "ash-use-alternate-shelf",
+      IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME,
+      IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION,
+      kOsCrOS,
+      ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout,
+                                ash::switches::kAshDisableAlternateShelfLayout)
+  },
+  {
       "ash-disable-drag-off-shelf",
       IDS_FLAGS_DRAG_OFF_SHELF_NAME,
       IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION,
       kOsCrOS,
       SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf)
   },
   {
     "enable-background-loader",
     IDS_ENABLE_BACKLOADER_NAME,
     IDS_ENABLE_BACKLOADER_DESCRIPTION,
@@ skipping 1445 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags