ToolbarView MaterialDesign in ThemeProvider

ui/base/resource/material_design/material_design_controller.h

Index: ui/base/resource/material_design/material_design_controller.h
diff --git a/ui/base/resource/material_design/material_design_controller.h b/ui/base/resource/material_design/material_design_controller.h
index 738fa765e9fb5221155ad4b868a8c3f058c71525..af92f4d62bcd40067d0fc66f188a8d6cc14d19ab 100644
--- a/ui/base/resource/material_design/material_design_controller.h
+++ b/ui/base/resource/material_design/material_design_controller.h
@@ -17,14 +17,15 @@ class MaterialDesignControllerTestAPI;
 // Central controller to handle material design modes.
 class UI_BASE_EXPORT MaterialDesignController {
  public:
-  // The different material design modes.
-  enum class Mode {
+  // The different material design modes. The order cannot be changed without
+  // updating references as these are used as array indices.
+  enum Mode {
+    // Classic, non-material design.
+    NON_MATERIAL = 0,
     // Basic material design.
-    MATERIAL_NORMAL,
+    MATERIAL_NORMAL = 1,
     // Material design targeted at mouse/touch hybrid devices.
-    MATERIAL_HYBRID,
-    // Classic, non-material design.
-    NON_MATERIAL
+    MATERIAL_HYBRID = 2
   };
 
   // Get the current Mode that should be used by the system.