Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: content/common/content_switches_internal.cc

Issue 1820983003: Revert of Disable use-zoom-for-dsf flag for m50 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/content_switches_internal.h" 5 #include "content/common/content_switches_internal.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "content/public/common/content_switches.h" 12 #include "content/public/common/content_switches.h"
13 13
14 #if defined(OS_WIN) 14 #if defined(OS_WIN)
15 #include "base/win/windows_version.h" 15 #include "base/win/windows_version.h"
16 #include "ui/gfx/win/direct_write.h" 16 #include "ui/gfx/win/direct_write.h"
17 #endif 17 #endif
18 18
19 namespace content { 19 namespace content {
20 20
21 namespace { 21 namespace {
22 22
23 #if defined(OS_WIN) 23 #if defined(OS_WIN)
24 static bool g_win32k_renderer_lockdown_disabled = false; 24 static bool g_win32k_renderer_lockdown_disabled = false;
25 #endif 25 #endif
26 26
27 bool IsUseZoomForDSFEnabledByDefault() { 27 bool IsUseZoomForDSFEnabledByDefault() {
28 #if defined(OS_CHROMEOS)
29 return true;
30 #else
28 return false; 31 return false;
32 #endif
29 } 33 }
30 34
31 } // namespace 35 } // namespace
32 36
33 bool IsPinchToZoomEnabled() { 37 bool IsPinchToZoomEnabled() {
34 const base::CommandLine& command_line = 38 const base::CommandLine& command_line =
35 *base::CommandLine::ForCurrentProcess(); 39 *base::CommandLine::ForCurrentProcess();
36 40
37 // Enable pinch everywhere unless it's been explicitly disabled. 41 // Enable pinch everywhere unless it's been explicitly disabled.
38 return !command_line.HasSwitch(switches::kDisablePinch); 42 return !command_line.HasSwitch(switches::kDisablePinch);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 bool enabled = 88 bool enabled =
85 (command_line->HasSwitch(switches::kEnableUseZoomForDSF) || 89 (command_line->HasSwitch(switches::kEnableUseZoomForDSF) ||
86 use_zoom_for_dsf_enabled_by_default) && 90 use_zoom_for_dsf_enabled_by_default) &&
87 command_line->GetSwitchValueASCII( 91 command_line->GetSwitchValueASCII(
88 switches::kEnableUseZoomForDSF) != "false"; 92 switches::kEnableUseZoomForDSF) != "false";
89 93
90 return enabled; 94 return enabled;
91 } 95 }
92 96
93 } // namespace content 97 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698