Some more pre-material cleanups

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
index b3df2273ccac499b32b0fa1d672c4bfe21164144..c58b2fc630b3c98cfe2718f86956e59318f65060 100644
--- a/ui/base/material_design/material_design_controller.h
+++ b/ui/base/material_design/material_design_controller.h
@@ -21,9 +21,9 @@ class UI_BASE_EXPORT MaterialDesignController {
   // updating references as these are used as array indices.
   enum Mode {
     // Basic material design.
-    MATERIAL_NORMAL = 1,
+    MATERIAL_NORMAL = 0,
     // Material design targeted at mouse/touch hybrid devices.
-    MATERIAL_HYBRID = 2
+    MATERIAL_HYBRID = 1
   };

[Peter Kasting, 2016/10/24 23:49:56]

Probably long term we remove these and replace with some sort of hybrid-mode
bool?

[Evan Stade, 2016/10/25 16:22:57]

I briefly discussed with Terry, and it's my feeling that the long term fate of
this class (assuming it's going to boil down to just normal vs hybrid) would be
to moved somehow to chrome/browser. I don't think anything outside of there
makes a distinction between normal and hybrid.

 
   // Initializes |mode_|. Must be called before checking |mode_|.