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

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

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 7 years, 7 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"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/string_split.h" 12 #include "base/strings/string_split.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/prefs/proxy_config_dictionary.h" 14 #include "chrome/browser/prefs/proxy_config_dictionary.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
17 #include "ui/base/ui_base_switches.h" 17 #include "ui/base/ui_base_switches.h"
18 18
19 #if defined(OS_CHROMEOS)
20 #include "chromeos/chromeos_switches.h"
21 #endif
22
19 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry 23 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry
20 CommandLinePrefStore::string_switch_map_[] = { 24 CommandLinePrefStore::string_switch_map_[] = {
21 { switches::kLang, prefs::kApplicationLocale }, 25 { switches::kLang, prefs::kApplicationLocale },
22 { switches::kAuthSchemes, prefs::kAuthSchemes }, 26 { switches::kAuthSchemes, prefs::kAuthSchemes },
23 { switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist }, 27 { switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist },
24 { switches::kAuthNegotiateDelegateWhitelist, 28 { switches::kAuthNegotiateDelegateWhitelist,
25 prefs::kAuthNegotiateDelegateWhitelist }, 29 prefs::kAuthNegotiateDelegateWhitelist },
26 { switches::kGSSAPILibraryName, prefs::kGSSAPILibraryName }, 30 { switches::kGSSAPILibraryName, prefs::kGSSAPILibraryName },
27 { switches::kSpdyProxyAuthOrigin, prefs::kSpdyProxyAuthOrigin }, 31 { switches::kSpdyProxyAuthOrigin, prefs::kSpdyProxyAuthOrigin },
28 { switches::kDiskCacheDir, prefs::kDiskCacheDir }, 32 { switches::kDiskCacheDir, prefs::kDiskCacheDir },
(...skipping 26 matching lines...) Expand all
55 true }, 59 true },
56 { switches::kEnableUnrestrictedSSL3Fallback, 60 { switches::kEnableUnrestrictedSSL3Fallback,
57 prefs::kEnableUnrestrictedSSL3Fallback, true }, 61 prefs::kEnableUnrestrictedSSL3Fallback, true },
58 { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true }, 62 { switches::kEnableMemoryInfo, prefs::kEnableMemoryInfo, true },
59 #if defined(GOOGLE_CHROME_BUILD) 63 #if defined(GOOGLE_CHROME_BUILD)
60 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, 64 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true },
61 #else 65 #else
62 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false }, 66 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false },
63 #endif 67 #endif
64 #if defined(OS_CHROMEOS) 68 #if defined(OS_CHROMEOS)
65 { switches::kDisableDrive, prefs::kDisableDrive, true }, 69 { chromeos::switches::kDisableDrive, prefs::kDisableDrive, true },
66 { switches::kEnableTouchpadThreeFingerClick, 70 { chromeos::switches::kEnableTouchpadThreeFingerClick,
67 prefs::kEnableTouchpadThreeFingerClick, true }, 71 prefs::kEnableTouchpadThreeFingerClick, true },
68 { switches::kEnableTouchpadThreeFingerSwipe, 72 { chromeos::switches::kEnableTouchpadThreeFingerSwipe,
69 prefs::kEnableTouchpadThreeFingerSwipe, true }, 73 prefs::kEnableTouchpadThreeFingerSwipe, true },
70 #endif 74 #endif
71 { switches::kDisableCloudPolicyOnSignin, 75 { switches::kDisableCloudPolicyOnSignin,
72 prefs::kDisableCloudPolicyOnSignin, true }, 76 prefs::kDisableCloudPolicyOnSignin, true },
73 { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false }, 77 { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false },
74 { switches::kEnableAsyncDns, prefs::kBuiltInDnsClientEnabled, true }, 78 { switches::kEnableAsyncDns, prefs::kBuiltInDnsClientEnabled, true },
75 }; 79 };
76 80
77 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry 81 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry
78 CommandLinePrefStore::integer_switch_map_[] = { 82 CommandLinePrefStore::integer_switch_map_[] = {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 } 181 }
178 } 182 }
179 183
180 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { 184 void CommandLinePrefStore::ApplyBackgroundModeSwitches() {
181 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) || 185 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) ||
182 command_line_->HasSwitch(switches::kDisableExtensions)) { 186 command_line_->HasSwitch(switches::kDisableExtensions)) {
183 Value* value = Value::CreateBooleanValue(false); 187 Value* value = Value::CreateBooleanValue(false);
184 SetValue(prefs::kBackgroundModeEnabled, value); 188 SetValue(prefs::kBackgroundModeEnabled, value);
185 } 189 }
186 } 190 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/browser_policy_connector.cc ('k') | chrome/browser/ui/ash/event_rewriter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698