OLD | NEW |
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/feature_list.h" | 10 #include "base/feature_list.h" |
11 #include "base/metrics/field_trial.h" | 11 #include "base/metrics/field_trial.h" |
12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
13 #include "content/public/common/content_switches.h" | 13 #include "content/public/common/content_switches.h" |
14 | 14 |
15 #if defined(OS_WIN) | 15 #if defined(OS_WIN) |
16 #include "base/win/windows_version.h" | 16 #include "base/win/windows_version.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 const base::Feature kUseZoomForDsfEnabledByDefault { | 24 const base::Feature kUseZoomForDsfEnabledByDefault { |
25 "use-zoom-for-dsf enabled by default", base::FEATURE_ENABLED_BY_DEFAULT | 25 "use-zoom-for-dsf enabled by default", base::FEATURE_ENABLED_BY_DEFAULT |
26 }; | 26 }; |
27 #endif | 27 #endif |
28 | 28 |
29 bool IsUseZoomForDSFEnabledByDefault() { | 29 bool IsUseZoomForDSFEnabledByDefault() { |
30 #if defined(OS_CHROMEOS) | 30 #if defined(OS_CHROMEOS) || defined(OS_LINUX) |
31 return true; | 31 return true; |
32 #elif defined(OS_WIN) | 32 #elif defined(OS_WIN) |
33 return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault); | 33 return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault); |
34 #else | 34 #else |
35 return false; | 35 return false; |
36 #endif | 36 #endif |
37 } | 37 } |
38 | 38 |
39 } // namespace | 39 } // namespace |
40 | 40 |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 return ProgressBarCompletion::DOM_CONTENT_LOADED; | 104 return ProgressBarCompletion::DOM_CONTENT_LOADED; |
105 if (progress_bar_completion == | 105 if (progress_bar_completion == |
106 "resourcesBeforeDOMContentLoadedAndSameOriginIframes") { | 106 "resourcesBeforeDOMContentLoadedAndSameOriginIframes") { |
107 return ProgressBarCompletion::RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES; | 107 return ProgressBarCompletion::RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES; |
108 } | 108 } |
109 #endif | 109 #endif |
110 return ProgressBarCompletion::LOAD_EVENT; | 110 return ProgressBarCompletion::LOAD_EVENT; |
111 } | 111 } |
112 | 112 |
113 } // namespace content | 113 } // namespace content |
OLD | NEW |