Reland of Disable use-zoom-for-dsf flag for m50

content/common/content_switches_internal.cc

 // Copyright (c) 2014 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 "content/common/content_switches_internal.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
 #include "content/public/common/content_switches.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "ui/gfx/win/direct_write.h"
 #endif
 
 namespace content {
 
 namespace {
 
 #if defined(OS_WIN)
 static bool g_win32k_renderer_lockdown_disabled = false;
 #endif
 
 bool IsUseZoomForDSFEnabledByDefault() {
-#if defined(OS_CHROMEOS)
-  return true;
-#else
   return false;
-#endif
 }
 
 }  // namespace
 
 bool IsPinchToZoomEnabled() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
   // Enable pinch everywhere unless it's been explicitly disabled.
   return !command_line.HasSwitch(switches::kDisablePinch);
@@ skipping 45 matching lines @@
   bool enabled =
       (command_line->HasSwitch(switches::kEnableUseZoomForDSF) ||
        use_zoom_for_dsf_enabled_by_default) &&
       command_line->GetSwitchValueASCII(
           switches::kEnableUseZoomForDSF) != "false";
 
   return enabled;
 }
 
 } // namespace content