Chromium Code Reviews| 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 <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 52 prefs::kWebKitAllowRunningInsecureContent, true }, | 52 prefs::kWebKitAllowRunningInsecureContent, true }, |
| 53 { switches::kNoDisplayingInsecureContent, | 53 { switches::kNoDisplayingInsecureContent, |
| 54 prefs::kWebKitAllowDisplayingInsecureContent, false }, | 54 prefs::kWebKitAllowDisplayingInsecureContent, false }, |
| 55 { switches::kAllowCrossOriginAuthPrompt, | 55 { switches::kAllowCrossOriginAuthPrompt, |
| 56 prefs::kAllowCrossOriginAuthPrompt, true }, | 56 prefs::kAllowCrossOriginAuthPrompt, true }, |
| 57 { switches::kDisableTLSChannelID, prefs::kEnableOriginBoundCerts, false }, | 57 { switches::kDisableTLSChannelID, prefs::kEnableOriginBoundCerts, false }, |
| 58 { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting, | 58 { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting, |
| 59 true }, | 59 true }, |
| 60 { switches::kEnableUnrestrictedSSL3Fallback, | 60 { switches::kEnableUnrestrictedSSL3Fallback, |
| 61 prefs::kEnableUnrestrictedSSL3Fallback, true }, | 61 prefs::kEnableUnrestrictedSSL3Fallback, true }, |
| 62 { switches::kEnableSignedCertTimestamps, | |
| 63 prefs::kEnableSignedCertTimestamps, false }, | |
|
wtc
2013/11/26 17:32:55
BUG: I think the third element should be true when
ekasper
2013/11/26 19:33:54
Yes, my bad - the third value should indicate the
| |
| 62 { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true }, | 64 { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true }, |
| 63 #if defined(GOOGLE_CHROME_BUILD) | 65 #if defined(GOOGLE_CHROME_BUILD) |
| 64 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, | 66 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, |
| 65 #else | 67 #else |
| 66 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false }, | 68 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false }, |
| 67 #endif | 69 #endif |
| 68 #if defined(OS_CHROMEOS) | 70 #if defined(OS_CHROMEOS) |
| 69 { chromeos::switches::kDisableDrive, prefs::kDisableDrive, true }, | 71 { chromeos::switches::kDisableDrive, prefs::kDisableDrive, true }, |
| 70 { chromeos::switches::kEnableTouchpadThreeFingerClick, | 72 { chromeos::switches::kEnableTouchpadThreeFingerClick, |
| 71 prefs::kEnableTouchpadThreeFingerClick, true }, | 73 prefs::kEnableTouchpadThreeFingerClick, true }, |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 180 } | 182 } |
| 181 } | 183 } |
| 182 | 184 |
| 183 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { | 185 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { |
| 184 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) || | 186 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) || |
| 185 command_line_->HasSwitch(switches::kDisableExtensions)) { | 187 command_line_->HasSwitch(switches::kDisableExtensions)) { |
| 186 Value* value = Value::CreateBooleanValue(false); | 188 Value* value = Value::CreateBooleanValue(false); |
| 187 SetValue(prefs::kBackgroundModeEnabled, value); | 189 SetValue(prefs::kBackgroundModeEnabled, value); |
| 188 } | 190 } |
| 189 } | 191 } |
| OLD | NEW |