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

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

Issue 1221033002: Add proxy_config component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update copyrights Created 5 years, 5 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/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_split.h" 13 #include "base/strings/string_split.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/prefs/proxy_config_dictionary.h"
16 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
17 #include "components/proxy_config/proxy_config_dictionary.h"
18 #include "ui/base/ui_base_switches.h" 18 #include "ui/base/ui_base_switches.h"
19 19
20 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
21 #include "chromeos/chromeos_switches.h" 21 #include "chromeos/chromeos_switches.h"
22 #endif 22 #endif
23 23
24 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry 24 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry
25 CommandLinePrefStore::string_switch_map_[] = { 25 CommandLinePrefStore::string_switch_map_[] = {
26 { switches::kLang, prefs::kApplicationLocale }, 26 { switches::kLang, prefs::kApplicationLocale },
27 { data_reduction_proxy::switches::kDataReductionProxy, 27 { data_reduction_proxy::switches::kDataReductionProxy,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); 184 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
185 } 185 }
186 } 186 }
187 187
188 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { 188 void CommandLinePrefStore::ApplyBackgroundModeSwitches() {
189 if (command_line_->HasSwitch(switches::kDisableExtensions)) 189 if (command_line_->HasSwitch(switches::kDisableExtensions))
190 SetValue(prefs::kBackgroundModeEnabled, 190 SetValue(prefs::kBackgroundModeEnabled,
191 make_scoped_ptr(new base::FundamentalValue(false)), 191 make_scoped_ptr(new base::FundamentalValue(false)),
192 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); 192 WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
193 } 193 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698