Remove touch optimized layout on ChromeOS

ui/base/layout.cc

 // Copyright (c) 2012 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 "ui/base/layout.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(USE_AURA) && !defined(OS_WIN)
 #include "ui/aura/root_window.h"
 #include "ui/compositor/compositor.h"
 #endif  // defined(USE_AURA) && !defined(OS_WIN)
 
-#if defined(USE_AURA) && defined(USE_X11)
-#include "ui/base/touch/touch_factory.h"
-#endif // defined(USE_AURA) && defined(USE_X11)
-
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include <Windows.h>
 #endif  // defined(OS_WIN)
 
 namespace {
@@ skipping 16 matching lines @@
       return false;
     } else if (switch_value != switches::kTouchOptimizedUIAuto) {
       LOG(ERROR) << "Invalid --touch-optimized-ui option: " << switch_value;
     }
   }
 
 #if defined(OS_WIN)
   // On Windows, we use the touch layout only when we are running in
   // Metro mode.
   return base::win::IsMetroProcess() && base::win::IsTouchEnabled();
-#elif defined(USE_AURA) && defined(USE_X11)
-  // Determine whether touch-screen hardware is currently available.
-  // For now we must ensure this won't change over the life of the process,
-  // since we don't yet support updating the UI.  crbug.com/124399
-  static bool has_touch_device =
-      ui::TouchFactory::GetInstance()->IsTouchDevicePresent();
-
-  // Work-around for late device detection in some cases.  If we've asked for
-  // touch calibration then we're certainly expecting a touch screen, it must
-  // just not be ready yet.  Force-enable touch-ui mode in this case.
-  static bool enable_touch_calibration = CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kEnableTouchCalibration);
-  if (!has_touch_device && enable_touch_calibration)
-    has_touch_device = true;
-
-  return has_touch_device;
 #else
   return false;
 #endif
 }
 
 const float kScaleFactorScales[] = {1.0, 2.0};
 const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales);
 
 std::vector<ui::ScaleFactor>& GetSupportedScaleFactorsInternal() {
   static std::vector<ui::ScaleFactor>* supported_scale_factors =
@@ skipping 76 matching lines @@
   return GetScaleFactorFromScale(
       view->GetRootWindow()->compositor()->device_scale_factor());
 #else
   NOTIMPLEMENTED();
   return SCALE_FACTOR_NONE;
 #endif
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace ui