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

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

Issue 3162047: FBTF: Move some heavy, repeatedly emitted symbols to implementation files. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: mac fixes Created 10 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
« no previous file with comments | « base/process_util_unittest.cc ('k') | chrome/browser/search_engines/template_url.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/app_switches.h" 7 #include "app/app_switches.h"
8 #include "base/logging.h"
8 #include "base/values.h" 9 #include "base/values.h"
9 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
10 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
11 12
12 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry 13 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry
13 CommandLinePrefStore::string_switch_map_[] = { 14 CommandLinePrefStore::string_switch_map_[] = {
14 { switches::kLang, prefs::kApplicationLocale }, 15 { switches::kLang, prefs::kApplicationLocale },
15 { switches::kProxyServer, prefs::kProxyServer }, 16 { switches::kProxyServer, prefs::kProxyServer },
16 { switches::kProxyPacUrl, prefs::kProxyPacUrl }, 17 { switches::kProxyPacUrl, prefs::kProxyPacUrl },
17 { switches::kProxyBypassList, prefs::kProxyBypassList }, 18 { switches::kProxyBypassList, prefs::kProxyBypassList },
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 (command_line_->HasSwitch(switches::kProxyAutoDetect) || 58 (command_line_->HasSwitch(switches::kProxyAutoDetect) ||
58 command_line_->HasSwitch(switches::kProxyServer) || 59 command_line_->HasSwitch(switches::kProxyServer) ||
59 command_line_->HasSwitch(switches::kProxyPacUrl) || 60 command_line_->HasSwitch(switches::kProxyPacUrl) ||
60 command_line_->HasSwitch(switches::kProxyBypassList))) { 61 command_line_->HasSwitch(switches::kProxyBypassList))) {
61 LOG(WARNING) << "Additional command-line proxy switches specified when --" 62 LOG(WARNING) << "Additional command-line proxy switches specified when --"
62 << switches::kNoProxyServer << " was also specified."; 63 << switches::kNoProxyServer << " was also specified.";
63 return false; 64 return false;
64 } 65 }
65 return true; 66 return true;
66 } 67 }
OLDNEW
« no previous file with comments | « base/process_util_unittest.cc ('k') | chrome/browser/search_engines/template_url.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698