| 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/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 #endif | 16 #endif |
| 17 | 17 |
| 18 namespace content { | 18 namespace content { |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 bool IsUseZoomForDSFEnabledByDefault() { | 22 bool IsUseZoomForDSFEnabledByDefault() { |
| 23 #if defined(OS_CHROMEOS) | 23 #if defined(OS_CHROMEOS) || defined(OS_WIN) |
| 24 return true; | 24 return true; |
| 25 #else | 25 #else |
| 26 return false; | 26 return false; |
| 27 #endif | 27 #endif |
| 28 } | 28 } |
| 29 | 29 |
| 30 } // namespace | 30 } // namespace |
| 31 | 31 |
| 32 bool IsPinchToZoomEnabled() { | 32 bool IsPinchToZoomEnabled() { |
| 33 const base::CommandLine& command_line = | 33 const base::CommandLine& command_line = |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 return ProgressBarCompletion::DOM_CONTENT_LOADED; | 95 return ProgressBarCompletion::DOM_CONTENT_LOADED; |
| 96 if (progress_bar_completion == | 96 if (progress_bar_completion == |
| 97 "resourcesBeforeDOMContentLoadedAndSameOriginIframes") { | 97 "resourcesBeforeDOMContentLoadedAndSameOriginIframes") { |
| 98 return ProgressBarCompletion::RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES; | 98 return ProgressBarCompletion::RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES; |
| 99 } | 99 } |
| 100 #endif | 100 #endif |
| 101 return ProgressBarCompletion::LOAD_EVENT; | 101 return ProgressBarCompletion::LOAD_EVENT; |
| 102 } | 102 } |
| 103 | 103 |
| 104 } // namespace content | 104 } // namespace content |
| OLD | NEW |