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 "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 { switches::kAllowCrossOriginAuthPrompt, | 60 { switches::kAllowCrossOriginAuthPrompt, |
61 prefs::kAllowCrossOriginAuthPrompt, true }, | 61 prefs::kAllowCrossOriginAuthPrompt, true }, |
62 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, | 62 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, |
63 #if defined(OS_CHROMEOS) | 63 #if defined(OS_CHROMEOS) |
64 { chromeos::switches::kEnableTouchpadThreeFingerClick, | 64 { chromeos::switches::kEnableTouchpadThreeFingerClick, |
65 prefs::kEnableTouchpadThreeFingerClick, true }, | 65 prefs::kEnableTouchpadThreeFingerClick, true }, |
66 { ash::switches::kAshEnableUnifiedDesktop, | 66 { ash::switches::kAshEnableUnifiedDesktop, |
67 prefs::kUnifiedDesktopEnabledByDefault, true }, | 67 prefs::kUnifiedDesktopEnabledByDefault, true }, |
68 #endif | 68 #endif |
69 { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false }, | 69 { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false }, |
| 70 { switches::kEnableTokenBinding, prefs::kEnableTokenBinding, true }, |
70 }; | 71 }; |
71 | 72 |
72 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry | 73 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry |
73 CommandLinePrefStore::integer_switch_map_[] = { | 74 CommandLinePrefStore::integer_switch_map_[] = { |
74 { switches::kDiskCacheSize, prefs::kDiskCacheSize }, | 75 { switches::kDiskCacheSize, prefs::kDiskCacheSize }, |
75 { switches::kMediaCacheSize, prefs::kMediaCacheSize }, | 76 { switches::kMediaCacheSize, prefs::kMediaCacheSize }, |
76 }; | 77 }; |
77 | 78 |
78 CommandLinePrefStore::CommandLinePrefStore( | 79 CommandLinePrefStore::CommandLinePrefStore( |
79 const base::CommandLine* command_line) | 80 const base::CommandLine* command_line) |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 } | 190 } |
190 } | 191 } |
191 | 192 |
192 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { | 193 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { |
193 if (command_line_->HasSwitch(switches::kDisableExtensions)) { | 194 if (command_line_->HasSwitch(switches::kDisableExtensions)) { |
194 SetValue(prefs::kBackgroundModeEnabled, | 195 SetValue(prefs::kBackgroundModeEnabled, |
195 make_scoped_ptr(new base::FundamentalValue(false)), | 196 make_scoped_ptr(new base::FundamentalValue(false)), |
196 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); | 197 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
197 } | 198 } |
198 } | 199 } |
OLD | NEW |