Set material hybrid by default on ChromeOS touch devices

ui/base/material_design/material_design_controller.cc

Index: ui/base/material_design/material_design_controller.cc
diff --git a/ui/base/material_design/material_design_controller.cc b/ui/base/material_design/material_design_controller.cc
index baf4fa19dd1a6c432d185496e2509f1fd81fe719..4ed14b5f5f0c10a1b82a94516848d3731f200dcb 100644
--- a/ui/base/material_design/material_design_controller.cc
+++ b/ui/base/material_design/material_design_controller.cc
@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "ui/base/material_design/material_design_controller.h"
+#include "ui/base/touch/touch_device.h"
 #include "ui/base/ui_base_switches.h"
 
 namespace ui {
@@ -30,6 +31,8 @@ bool MaterialDesignController::IsModeMaterial() {
 
 MaterialDesignController::Mode MaterialDesignController::DefaultMode() {
 #if defined(OS_CHROMEOS)
+  if (GetTouchScreensAvailability() == TouchScreensAvailability::ENABLED)

[tdanderson, 2016/02/22 23:47:40]

Doesn't look like this will work as-is, since the resource bundle is initialized
(and hence IsModeMaterial() is called) before the device is registered in
DeviceDataManager.

+    return Mode::MATERIAL_HYBRID;
   return Mode::MATERIAL_NORMAL;
 #else
   return Mode::NON_MATERIAL;