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

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

Issue 10693022: Add support for loading user cloud policy on desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed redundant #ifdef OS_CHROMEOS guard Created 8 years, 4 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #if defined(GOOGLE_CHROME_BUILD) 57 #if defined(GOOGLE_CHROME_BUILD)
58 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, 58 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true },
59 #else 59 #else
60 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false }, 60 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false },
61 #endif 61 #endif
62 #if defined(OS_CHROMEOS) 62 #if defined(OS_CHROMEOS)
63 { switches::kDisableGData, prefs::kDisableGData, true }, 63 { switches::kDisableGData, prefs::kDisableGData, true },
64 { switches::kEnableTouchpadThreeFingerClick, 64 { switches::kEnableTouchpadThreeFingerClick,
65 prefs::kEnableTouchpadThreeFingerClick, true }, 65 prefs::kEnableTouchpadThreeFingerClick, true },
66 #endif 66 #endif
67 { switches::kLoadCloudPolicyOnSignin, prefs::kLoadCloudPolicyOnSignin,
68 true },
67 }; 69 };
68 70
69 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry 71 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry
70 CommandLinePrefStore::integer_switch_map_[] = { 72 CommandLinePrefStore::integer_switch_map_[] = {
71 { switches::kDiskCacheSize, prefs::kDiskCacheSize }, 73 { switches::kDiskCacheSize, prefs::kDiskCacheSize },
72 { switches::kMediaCacheSize, prefs::kMediaCacheSize }, 74 { switches::kMediaCacheSize, prefs::kMediaCacheSize },
73 }; 75 };
74 76
75 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) 77 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line)
76 : command_line_(command_line) { 78 : command_line_(command_line) {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 171 }
170 } 172 }
171 173
172 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { 174 void CommandLinePrefStore::ApplyBackgroundModeSwitches() {
173 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) || 175 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) ||
174 command_line_->HasSwitch(switches::kDisableExtensions)) { 176 command_line_->HasSwitch(switches::kDisableExtensions)) {
175 Value* value = Value::CreateBooleanValue(false); 177 Value* value = Value::CreateBooleanValue(false);
176 SetValue(prefs::kBackgroundModeEnabled, value); 178 SetValue(prefs::kBackgroundModeEnabled, value);
177 } 179 }
178 } 180 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698