Index: chrome/browser/prefs/command_line_pref_store.cc |
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc |
index ba83704f9c7a8c7d8b6e4b77bcd7f95ae096f9e1..1547b1b46dc39399978493ca739c36a7a7040e57 100644 |
--- a/chrome/browser/prefs/command_line_pref_store.cc |
+++ b/chrome/browser/prefs/command_line_pref_store.cc |
@@ -81,6 +81,19 @@ CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) |
CommandLinePrefStore::~CommandLinePrefStore() {} |
+bool CommandLinePrefStore::ValidateProxySwitches() { |
+ if (command_line_->HasSwitch(switches::kNoProxyServer) && |
+ (command_line_->HasSwitch(switches::kProxyAutoDetect) || |
+ command_line_->HasSwitch(switches::kProxyServer) || |
+ command_line_->HasSwitch(switches::kProxyPacUrl) || |
+ command_line_->HasSwitch(switches::kProxyBypassList))) { |
+ LOG(WARNING) << "Additional command-line proxy switches specified when --" |
+ << switches::kNoProxyServer << " was also specified."; |
+ return false; |
+ } |
+ return true; |
+} |
+ |
void CommandLinePrefStore::ApplySimpleSwitches() { |
// Look for each switch we know about and set its preference accordingly. |
for (size_t i = 0; i < arraysize(string_switch_map_); ++i) { |
@@ -116,19 +129,6 @@ void CommandLinePrefStore::ApplySimpleSwitches() { |
} |
} |
-bool CommandLinePrefStore::ValidateProxySwitches() { |
- if (command_line_->HasSwitch(switches::kNoProxyServer) && |
- (command_line_->HasSwitch(switches::kProxyAutoDetect) || |
- command_line_->HasSwitch(switches::kProxyServer) || |
- command_line_->HasSwitch(switches::kProxyPacUrl) || |
- command_line_->HasSwitch(switches::kProxyBypassList))) { |
- LOG(WARNING) << "Additional command-line proxy switches specified when --" |
- << switches::kNoProxyServer << " was also specified."; |
- return false; |
- } |
- return true; |
-} |
- |
void CommandLinePrefStore::ApplyProxyMode() { |
if (command_line_->HasSwitch(switches::kNoProxyServer)) { |
SetValue(prefs::kProxy, |