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

ash/ash_switches.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/ash_switches.h"
 
 #include "base/command_line.h"
 
 namespace ash {
 namespace switches {
@@ skipping 164 matching lines @@
 const char kAshSecondaryDisplayLayout[] = "ash-secondary-display-layout";
 
 // Use the old behavior where the user can pick the width of a side maximized
 // window. The user selects the width of the side maximized window based on how
 // far off the edge of the work area they drag the window.
 const char kAshMultipleSnapWindowWidths[] = "ash-multiple-snap-window-widths";
 
 // Enables the heads-up display for tracking touch points.
 const char kAshTouchHud[] = "ash-touch-hud";
 
-// Use alternate layout of the shelf for testing a new look and feel:
-// Slightly smaller profile, only 2 states for the "bar highlight" on
-// launcher buttons, app list icon with more visible state indication,
-// app list icon repositionable and defaulting as 1st item in shelf,
-// more visible state indication for background on status area.
-// crbug's [244983, 244990, 244994, 245005, 245012]
-const char kAshUseAlternateShelfLayout[] = "ash-use-alternate-shelf";
-
 // Uses the 1st display in --ash-host-window-bounds as internal display.
 // This is for debugging on linux desktop.
 const char kAshUseFirstDisplayAsInternal[] =
     "ash-use-first-display-as-internal";
 
 // (Most) Chrome OS hardware reports ACPI power button releases correctly.
 // Standard hardware reports releases immediately after presses.  If set, we
 // lock the screen or shutdown the system immediately in response to a press
 // instead of displaying an interactive animation.
 const char kAuraLegacyPowerButton[] = "aura-legacy-power-button";
@@ skipping 10 matching lines @@
 const char kHideShelfAlignmentMenu[] = "hide-launcher-alignment-menu";
 
 bool UseAlternateFrameCaptionButtonStyle() {
   // For the sake of simplicity, the alternate caption button style is only
   // used if snapped windows are always 50% of the screen's width.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(kAshEnableAlternateFrameCaptionButtonStyle) &&
       !command_line->HasSwitch(kAshMultipleSnapWindowWidths);
 }
 
-bool UseAlternateShelfLayout() {
-  return !CommandLine::ForCurrentProcess()->
-      HasSwitch(kAshDisableAlternateShelfLayout);
-}
-
 bool UseDragOffShelf() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableDragOffShelf);
 }
 
 bool UseImmersiveFullscreenForAllWindows() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
       kAshEnableImmersiveFullscreenForBrowserOnly);
 }
 
@@ skipping 37 matching lines @@
 }
 
 bool UseUsbChargerNotification() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableUsbChargerNotification);
 }
 #endif
 
 }  // namespace switches
 }  // namespace ash