Gut ash::MaterialDesignController, and remove the about:flags entry.

It's not removed completely because IsXXXMaterial() is still used in
many places and serves as a good marker for code cleanup, but it no
longer does anything useful.

A bunch of tests are updated as well to remove parameterization. The
amount of overlap with bug 685837 was not originally intended, but at a
certain point it became easier to keep removing code than to carefully
determine dependencies.

BUG=690048,685837

Review-Url: https://codereview.chromium.org/2692663002
Cr-Commit-Position: refs/heads/master@{#450531}

Author: estade

ash/BUILD.gn

@@ -1167,9 +1167,6 @@ test("ash_unittests") {
     "common/frame/custom_frame_view_ash_unittest.cc",
     "common/frame/default_header_painter_unittest.cc",
 
-    # TODO: convert to use AshTest http://crbug.com/654491.
-    "common/material_design/material_design_controller_unittest.cc",
-
     # TODO: convert to use AshTest http://crbug.com/654492.
     "common/metrics/pointer_metrics_recorder_unittest.cc",
 

ash/common/ash_switches.cc

@@ -73,13 +73,6 @@ const char kAshForceEnablePalette[] = "ash-force-enable-palette";
 const char kAshHideNotificationsForFactory[] =
     "ash-hide-notifications-for-factory";
 
-// Specifies if Material Design elements in Chrome OS system UI are enabled.
-// Can be disabled / enabled / experimental allowing to launch incrementally.
-const char kAshMaterialDesign[] = "ash-md";
-const char kAshMaterialDesignDisabled[] = "disabled";
-const char kAshMaterialDesignEnabled[] = "enabled";
-const char kAshMaterialDesignExperimental[] = "experimental";
-
 // Enables the heads-up display for tracking touch points.
 const char kAshTouchHud[] = "ash-touch-hud";
 

ash/common/ash_switches.h

@@ -31,10 +31,6 @@ ASH_EXPORT extern const char kAshEnableTouchView[];
 ASH_EXPORT extern const char kAshEnableMirroredScreen[];
 ASH_EXPORT extern const char kAshForceEnablePalette[];
 ASH_EXPORT extern const char kAshHideNotificationsForFactory[];
-ASH_EXPORT extern const char kAshMaterialDesign[];
-ASH_EXPORT extern const char kAshMaterialDesignDisabled[];
-ASH_EXPORT extern const char kAshMaterialDesignEnabled[];
-ASH_EXPORT extern const char kAshMaterialDesignExperimental[];
 ASH_EXPORT extern const char kAshTouchHud[];
 ASH_EXPORT extern const char kAuraLegacyPowerButton[];
 

ash/common/material_design/material_design_controller.cc

@@ -2,105 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <string>
-
-#include "ash/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/trace_event/trace_event.h"
-
-namespace ash {
-
-namespace {
-MaterialDesignController::Mode mode_ =
-    MaterialDesignController::Mode::UNINITIALIZED;
-}  // namespace
 
-// static
-void MaterialDesignController::Initialize() {
-  TRACE_EVENT0("startup", "ash::MaterialDesignController::InitializeMode");
-  DCHECK_EQ(mode_, Mode::UNINITIALIZED);
-
-  const std::string switch_value =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          ash::switches::kAshMaterialDesign);
-
-  if (switch_value == ash::switches::kAshMaterialDesignExperimental) {
-    SetMode(Mode::MATERIAL_EXPERIMENTAL);
-  } else if (switch_value == ash::switches::kAshMaterialDesignEnabled) {
-    SetMode(Mode::MATERIAL_NORMAL);
-  } else if (switch_value == ash::switches::kAshMaterialDesignDisabled) {
-    SetMode(Mode::NON_MATERIAL);
-  } else {
-    if (!switch_value.empty()) {
-      LOG(ERROR) << "Invalid value='" << switch_value
-                 << "' for command line switch '"
-                 << ash::switches::kAshMaterialDesign << "'.";
-    }
-    SetMode(DefaultMode());
-  }
-}
+#include <string>
 
-// static
-MaterialDesignController::Mode MaterialDesignController::GetMode() {
-  DCHECK_NE(mode_, Mode::UNINITIALIZED);
-  return mode_;
-}
+namespace ash {
 
 // static
 bool MaterialDesignController::IsShelfMaterial() {
-  return IsMaterial();
+  return true;
 }
 
 // static
 bool MaterialDesignController::IsImmersiveModeMaterial() {
-  return IsMaterial();
+  return true;
 }
 
 // static
 bool MaterialDesignController::IsSystemTrayMenuMaterial() {
-  return IsMaterial();
+  return true;
 }
 
 // static
 bool MaterialDesignController::UseMaterialDesignSystemIcons() {
-  return IsMaterial();
-}
-
-// static
-MaterialDesignController::Mode MaterialDesignController::mode() {
-  return mode_;
-}
-
-// static
-bool MaterialDesignController::IsMaterial() {
-  return IsMaterialExperimental() || IsMaterialNormal();
-}
-
-// static
-bool MaterialDesignController::IsMaterialNormal() {
-  return GetMode() == Mode::MATERIAL_NORMAL;
-}
-
-// static
-bool MaterialDesignController::IsMaterialExperimental() {
-  return GetMode() == Mode::MATERIAL_EXPERIMENTAL;
-}
-
-// static
-MaterialDesignController::Mode MaterialDesignController::DefaultMode() {
-  return Mode::MATERIAL_NORMAL;
-}
-
-// static
-void MaterialDesignController::SetMode(Mode mode) {
-  mode_ = mode;
-}
-
-// static
-void MaterialDesignController::Uninitialize() {
-  mode_ = Mode::UNINITIALIZED;
+  return true;
 }
 
 }  // namespace ash

ash/common/material_design/material_design_controller.h

@@ -10,81 +10,26 @@
 
 namespace ash {
 
-namespace test {
-class MaterialDesignControllerTestAPI;
-}  // namespace test
-
-// Central controller to handle material design modes.
+// TODO(estade): deprecated, remove: crbug.com/690957
 class ASH_EXPORT MaterialDesignController {
  public:
-  // The different material design modes for Chrome OS system UI.
-  enum Mode {
-    // Not initialized.
-    UNINITIALIZED = -1,
-    // Classic, non-material design.
-    NON_MATERIAL = 0,
-    // Basic material design.
-    MATERIAL_NORMAL = 1,
-    // Material design with experimental features.
-    MATERIAL_EXPERIMENTAL = 2
-  };
-
-  // Initializes |mode_|. Must be called before calling IsMaterial(),
-  // IsMaterialExperimental(), IsMaterialNormal(), or GetMode().
-  static void Initialize();
-
-  // Returns the currently initialized MaterialDesignController::Mode type for
-  // Chrome OS system UI.
-  static Mode GetMode();
-
-  // Returns true if Material Design features are enabled for Chrome OS shelf.
+  // Returns true.
   static bool IsShelfMaterial();
 
-  // Returns true if Material Design features are enabled for Chrome OS
-  // immersive mode.
+  // Returns true.
   static bool IsImmersiveModeMaterial();
 
-  // Returns true if Material Design features are enabled for Chrome OS system
-  // tray menu.
+  // Returns true.
   static bool IsSystemTrayMenuMaterial();
 
-  // Returns true if material design versions of icons should be used in the
-  // status tray and system menu.
+  // Returns true.
   static bool UseMaterialDesignSystemIcons();
 
  private:
-  friend class test::MaterialDesignControllerTestAPI;
-
   // Declarations only. Do not allow construction of an object.
   MaterialDesignController();
   ~MaterialDesignController();
 
-  // Material Design |Mode| for Chrome OS system UI. Used only by tests.
-  static Mode mode();
-
-  // Returns true if Material Design is enabled in Chrome OS system UI.
-  // Maps to "ash-md" flag "enabled" or "experimental" values.
-  static bool IsMaterial();
-
-  // Returns true if Material Design normal features are enabled in Chrome OS
-  // system UI. Maps to "--ash-md=enabled" command line switch value.
-  static bool IsMaterialNormal();
-
-  // Returns true if Material Design experimental features are enabled in
-  // Chrome OS system UI. Maps to "--ash-md=experimental" command line switch
-  // value.
-  static bool IsMaterialExperimental();
-
-  // Returns the per-platform default material design variant.
-  static Mode DefaultMode();
-
-  // Sets |mode_| to |mode|. Can be used by tests to directly set the mode.
-  static void SetMode(Mode mode);
-
-  // Resets the initialization state to uninitialized. To be used by tests to
-  // allow calling Initialize() more than once.
-  static void Uninitialize();
-
   DISALLOW_COPY_AND_ASSIGN(MaterialDesignController);
 };
 

ash/common/material_design/material_design_controller_unittest.cc

@@ -4,7 +4,6 @@
 
 #include "ash/common/shelf/shelf_constants.h"
 
-#include "ash/common/material_design/material_design_controller.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
 
@@ -32,10 +31,9 @@ int GetShelfConstant(ShelfConstant shelf_constant) {
   const int kShelfButtonSize[] = {44, 48, 48};
   const int kShelfInsetsForAutoHide[] = {3, 0, 0};
 
-  const int mode = MaterialDesignController::GetMode();
-  DCHECK(mode >= MaterialDesignController::NON_MATERIAL &&
-         mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL);
-
+  // TODO(estade): clean this up --- remove unneeded constants and reduce
+  // remaining arrays to a single constant.
+  const int mode = 1;
   switch (shelf_constant) {
     case SHELF_SIZE:
       return kShelfSize[mode];