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

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

Issue 10910240: Enable TLS channeld id by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 { switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize, 42 { switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize,
43 true }, 43 true },
44 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false }, 44 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false },
45 { switches::kNoReferrers, prefs::kEnableReferrers, false }, 45 { switches::kNoReferrers, prefs::kEnableReferrers, false },
46 { switches::kAllowRunningInsecureContent, 46 { switches::kAllowRunningInsecureContent,
47 prefs::kWebKitAllowRunningInsecureContent, true }, 47 prefs::kWebKitAllowRunningInsecureContent, true },
48 { switches::kNoDisplayingInsecureContent, 48 { switches::kNoDisplayingInsecureContent,
49 prefs::kWebKitAllowDisplayingInsecureContent, false }, 49 prefs::kWebKitAllowDisplayingInsecureContent, false },
50 { switches::kAllowCrossOriginAuthPrompt, 50 { switches::kAllowCrossOriginAuthPrompt,
51 prefs::kAllowCrossOriginAuthPrompt, true }, 51 prefs::kAllowCrossOriginAuthPrompt, true },
52 { switches::kEnableOriginBoundCerts, prefs::kEnableOriginBoundCerts, 52 { switches::kDisableTLSChannelID, prefs::kEnableOriginBoundCerts, false },
53 true },
54 { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting, 53 { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting,
55 true }, 54 true },
56 { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true }, 55 { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true },
57 #if defined(GOOGLE_CHROME_BUILD) 56 #if defined(GOOGLE_CHROME_BUILD)
58 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, 57 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true },
59 #else 58 #else
60 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false }, 59 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false },
61 #endif 60 #endif
62 #if defined(OS_CHROMEOS) 61 #if defined(OS_CHROMEOS)
63 { switches::kDisableGData, prefs::kDisableGData, true }, 62 { switches::kDisableGData, prefs::kDisableGData, true },
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 } 170 }
172 } 171 }
173 172
174 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { 173 void CommandLinePrefStore::ApplyBackgroundModeSwitches() {
175 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) || 174 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) ||
176 command_line_->HasSwitch(switches::kDisableExtensions)) { 175 command_line_->HasSwitch(switches::kDisableExtensions)) {
177 Value* value = Value::CreateBooleanValue(false); 176 Value* value = Value::CreateBooleanValue(false);
178 SetValue(prefs::kBackgroundModeEnabled, value); 177 SetValue(prefs::kBackgroundModeEnabled, value);
179 } 178 }
180 } 179 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698