Set material hybrid by default on ChromeOS touch devices

ui/base/material_design/material_design_controller.cc

 // 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.
 
 #include <string>
 
 #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 {
 
 bool MaterialDesignController::is_mode_initialized_ = false;
 
 MaterialDesignController::Mode MaterialDesignController::mode_ =
     MaterialDesignController::Mode::NON_MATERIAL;
 
 MaterialDesignController::Mode MaterialDesignController::GetMode() {
   if (!is_mode_initialized_)
     InitializeMode();
   CHECK(is_mode_initialized_);
   return mode_;
 }
 
 bool MaterialDesignController::IsModeMaterial() {
   return GetMode() == Mode::MATERIAL_NORMAL ||
          GetMode() == Mode::MATERIAL_HYBRID;
 }
 
 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;
 #endif  // defined(OS_CHROMEOS)
 }
 
 void MaterialDesignController::InitializeMode() {
 #if !defined(ENABLE_TOPCHROME_MD)
   SetMode(Mode::NON_MATERIAL);
 #else
@@ skipping 23 matching lines @@
       MaterialDesignController::Mode::NON_MATERIAL);
   is_mode_initialized_ = false;
 }
 
 void MaterialDesignController::SetMode(MaterialDesignController::Mode mode) {
   mode_ = mode;
   is_mode_initialized_ = true;
 }
 
 }  // namespace ui