Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / base / layout.cc

diff --git a/src/ui/base/layout.cc b/src/ui/base/layout.cc
index 01c38f1..783ab5a 100644 (file)
--- a/src/ui/base/layout.cc
+++ b/src/ui/base/layout.cc
@@ -34,33 +34,6 @@ bool ScaleFactorComparator(const ScaleFactor& lhs, const ScaleFactor& rhs){
 
 std::vector<ScaleFactor>* g_supported_scale_factors = NULL;
 
-#if defined(OS_WIN)
-// Helper function that determines whether we want to optimize the UI for touch.
-bool UseTouchOptimizedUI() {
-  // If --touch-optimized-ui is specified and not set to "auto", then override
-  // the hardware-determined setting (eg. for testing purposes).
-  static bool has_touch_optimized_ui = CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kTouchOptimizedUI);
-  if (has_touch_optimized_ui) {
-    const std::string switch_value = CommandLine::ForCurrentProcess()->
-        GetSwitchValueASCII(switches::kTouchOptimizedUI);
-
-    // Note that simply specifying the switch is the same as enabled.
-    if (switch_value.empty() ||
-        switch_value == switches::kTouchOptimizedUIEnabled) {
-      return true;
-    } else if (switch_value == switches::kTouchOptimizedUIDisabled) {
-      return false;
-    } else if (switch_value != switches::kTouchOptimizedUIAuto) {
-      LOG(ERROR) << "Invalid --touch-optimized-ui option: " << switch_value;
-    }
-  }
-
-  // We use the touch layout only when we are running in Metro mode.
-  return base::win::IsMetroProcess() && ui::IsTouchDevicePresent();
-}
-#endif  // defined(OS_WIN)
-
 const float kScaleFactorScales[] = {1.0f, 1.0f, 1.25f, 1.33f, 1.4f, 1.5f, 1.8f,
                                     2.0f, 3.0f};
 COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),
@@ -68,14 +41,6 @@ COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),
 
 }  // namespace
 
-DisplayLayout GetDisplayLayout() {
-#if defined(OS_WIN)
-  if (UseTouchOptimizedUI())
-    return LAYOUT_TOUCH;
-#endif
-  return LAYOUT_DESKTOP;
-}
-
 void SetSupportedScaleFactors(
     const std::vector<ui::ScaleFactor>& scale_factors) {
   if (g_supported_scale_factors != NULL)