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

Side by Side Diff: chrome/browser/prefs/command_line_pref_store.cc

Issue 14125003: Do not roll back to SSL 3.0 for Google properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a bug that prevents TLS 1.1 -> TLS 1.0 fallback. Created 7 years, 8 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
OLDNEW
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 { switches::kNoReferrers, prefs::kEnableReferrers, false }, 46 { switches::kNoReferrers, prefs::kEnableReferrers, false },
47 { switches::kAllowRunningInsecureContent, 47 { switches::kAllowRunningInsecureContent,
48 prefs::kWebKitAllowRunningInsecureContent, true }, 48 prefs::kWebKitAllowRunningInsecureContent, true },
49 { switches::kNoDisplayingInsecureContent, 49 { switches::kNoDisplayingInsecureContent,
50 prefs::kWebKitAllowDisplayingInsecureContent, false }, 50 prefs::kWebKitAllowDisplayingInsecureContent, false },
51 { switches::kAllowCrossOriginAuthPrompt, 51 { switches::kAllowCrossOriginAuthPrompt,
52 prefs::kAllowCrossOriginAuthPrompt, true }, 52 prefs::kAllowCrossOriginAuthPrompt, true },
53 { switches::kDisableTLSChannelID, prefs::kEnableOriginBoundCerts, false }, 53 { switches::kDisableTLSChannelID, prefs::kEnableOriginBoundCerts, false },
54 { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting, 54 { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting,
55 true }, 55 true },
56 { switches::kEnableSSL3Fallback,
57 prefs::kEnableSSL3Fallback, true },
wtc 2013/04/18 18:15:34 This should fit in one line now.
56 { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true }, 58 { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true },
57 #if defined(GOOGLE_CHROME_BUILD) 59 #if defined(GOOGLE_CHROME_BUILD)
58 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, 60 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true },
59 #else 61 #else
60 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false }, 62 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false },
61 #endif 63 #endif
62 #if defined(OS_CHROMEOS) 64 #if defined(OS_CHROMEOS)
63 { switches::kDisableDrive, prefs::kDisableDrive, true }, 65 { switches::kDisableDrive, prefs::kDisableDrive, true },
64 { switches::kEnableTouchpadThreeFingerClick, 66 { switches::kEnableTouchpadThreeFingerClick,
65 prefs::kEnableTouchpadThreeFingerClick, true }, 67 prefs::kEnableTouchpadThreeFingerClick, true },
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 } 177 }
176 } 178 }
177 179
178 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { 180 void CommandLinePrefStore::ApplyBackgroundModeSwitches() {
179 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) || 181 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) ||
180 command_line_->HasSwitch(switches::kDisableExtensions)) { 182 command_line_->HasSwitch(switches::kDisableExtensions)) {
181 Value* value = Value::CreateBooleanValue(false); 183 Value* value = Value::CreateBooleanValue(false);
182 SetValue(prefs::kBackgroundModeEnabled, value); 184 SetValue(prefs::kBackgroundModeEnabled, value);
183 } 185 }
184 } 186 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698