| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/prefs/command_line_pref_store.h" | 5 #include "chrome/browser/prefs/command_line_pref_store.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 { switches::kDisable3DAPIs, prefs::kDisable3DAPIs, true }, | 58 { switches::kDisable3DAPIs, prefs::kDisable3DAPIs, true }, |
| 59 { switches::kEnableCloudPrintProxy, prefs::kCloudPrintProxyEnabled, | 59 { switches::kEnableCloudPrintProxy, prefs::kCloudPrintProxyEnabled, |
| 60 true }, | 60 true }, |
| 61 { switches::kAllowOutdatedPlugins, prefs::kPluginsAllowOutdated, true }, | 61 { switches::kAllowOutdatedPlugins, prefs::kPluginsAllowOutdated, true }, |
| 62 { switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize, | 62 { switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize, |
| 63 true }, | 63 true }, |
| 64 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false }, | 64 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false }, |
| 65 { switches::kNoReferrers, prefs::kEnableReferrers, false }, | 65 { switches::kNoReferrers, prefs::kEnableReferrers, false }, |
| 66 { switches::kAllowRunningInsecureContent, | 66 { switches::kAllowRunningInsecureContent, |
| 67 prefs::kWebKitAllowRunningInsecureContent, true }, | 67 prefs::kWebKitAllowRunningInsecureContent, true }, |
| 68 { switches::kNoDisplayingInsecureContent, | |
| 69 prefs::kWebKitAllowDisplayingInsecureContent, false }, | |
| 70 { switches::kAllowCrossOriginAuthPrompt, | 68 { switches::kAllowCrossOriginAuthPrompt, |
| 71 prefs::kAllowCrossOriginAuthPrompt, true }, | 69 prefs::kAllowCrossOriginAuthPrompt, true }, |
| 72 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, | 70 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, |
| 73 #if defined(OS_CHROMEOS) | 71 #if defined(OS_CHROMEOS) |
| 74 { chromeos::switches::kEnableTouchpadThreeFingerClick, | 72 { chromeos::switches::kEnableTouchpadThreeFingerClick, |
| 75 prefs::kEnableTouchpadThreeFingerClick, true }, | 73 prefs::kEnableTouchpadThreeFingerClick, true }, |
| 76 { ash::switches::kAshEnableUnifiedDesktop, | 74 { ash::switches::kAshEnableUnifiedDesktop, |
| 77 prefs::kUnifiedDesktopEnabledByDefault, true }, | 75 prefs::kUnifiedDesktopEnabledByDefault, true }, |
| 78 #endif | 76 #endif |
| 79 { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false }, | 77 { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false }, |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 } | 198 } |
| 201 } | 199 } |
| 202 | 200 |
| 203 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { | 201 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { |
| 204 if (command_line_->HasSwitch(switches::kDisableExtensions)) { | 202 if (command_line_->HasSwitch(switches::kDisableExtensions)) { |
| 205 SetValue(prefs::kBackgroundModeEnabled, | 203 SetValue(prefs::kBackgroundModeEnabled, |
| 206 base::WrapUnique(new base::FundamentalValue(false)), | 204 base::WrapUnique(new base::FundamentalValue(false)), |
| 207 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); | 205 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
| 208 } | 206 } |
| 209 } | 207 } |
| OLD | NEW |