Moved --top-chrome-md command line switch from chrome_switches to ui_base_switches.

ui/base/material_design/material_design_controller.h

Index: ui/base/material_design/material_design_controller.h
diff --git a/ui/base/material_design/material_design_controller.h b/ui/base/material_design/material_design_controller.h
new file mode 100644
index 0000000000000000000000000000000000000000..1b1e77f9acd9bca940b49b943bc871ffabc19d05
--- /dev/null
+++ b/ui/base/material_design/material_design_controller.h
@@ -0,0 +1,63 @@
+// Copyright 2015 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.
+
+#ifndef UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
+#define UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
+
+#include "base/macros.h"
+#include "ui/base/ui_base_export.h"
+
+namespace ui {
+
+namespace test {
+class MaterialDesignControllerTestAPI;
+}  // namespace test
+
+// Central controller to handle material design modes.
+class UI_BASE_EXPORT MaterialDesignController {

[sadrul, 2015/06/24 18:18:08]

. Do you expect to add more to MaterialDesignController (or to
//ui/base/material_design/)? i.e. would it make sense for it to be a separate
component if it's going to do a lot of work?

. If not, would it make sense for this to live in
//ui/base/resource/material_design/?

[jonross, 2015/06/24 18:33:01]

In the future there is likely to be a reduction of MaterialDesignController. As
we do away with classic.

Depending on UI review there could be a point where the two material modes
become one, and this class can be removed entirely.

Though I can't rule out future UX decisions that could expand this class.

[bruthig, 2015/06/24 21:36:24]

Done. Moved to //ui/base/resource/material_design

+ public:
+  // The different material design modes.
+  enum class Mode {
+    // Basic material design.
+    MATERIAL,
+    // Material design targeted at mouse/touch hybrid devices.
+    MATERIAL_HYBRID,
+    // Classic, non-material design.
+    NON_MATERIAL
+  };
+
+  // Get the current Mode that should be used by the system.
+  static Mode GetMode();
+
+ private:
+  friend class test::MaterialDesignControllerTestAPI;
+
+  // Tracks whether |mode_| has been initialized. This is necessary so tests can
+  // reset the state back to a clean state during tear down.
+  static bool is_mode_initialized_;
+
+  // The current Mode to be used by the system.
+  static Mode mode_;
+
+  // Declarations only. Do not allow construction of an object.
+  MaterialDesignController();
+  ~MaterialDesignController();
+
+  // Initializes |mode_|.
+  static void InitializeMode();
+
+  // Resets the Mode state to uninitialized. To be used by tests to cleanup
+  // global state.
+  static void UninitializeMode();
+
+  // Set |mode_| to |mode| and updates |is_mode_initialized_| to true. Can be
+  // used by tests to directly set the mode.
+  static void SetMode(Mode mode);
+
+  DISALLOW_COPY_AND_ASSIGN(MaterialDesignController);
+};
+
+}  // namespace ui
+
+#endif  // UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_