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 a12ae53e4666bea47417ab55b784d2d386e8f1db..0335a75066105fcb5b597b488aec0ddb568a5e6c 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.
+  // The different material design modes. The order cannot be changed without
+  // updating references as these are used as array indices.
   enum class Mode {
+    // Classic, non-material design.
+    NON_MATERIAL = 0,
     // Basic material design.
-    MATERIAL,
+    MATERIAL = 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.