Intorduce a separate preference for 'proxy server mode'

chrome/browser/prefs/command_line_pref_store.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/command_line_pref_store.h"
 
 #include "app/app_switches.h"
 #include "base/logging.h"
 #include "base/values.h"
+#include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry
     CommandLinePrefStore::string_switch_map_[] = {
       { switches::kLang, prefs::kApplicationLocale },
       { switches::kProxyServer, prefs::kProxyServer },
       { switches::kProxyPacUrl, prefs::kProxyPacUrl },
       { switches::kProxyBypassList, prefs::kProxyBypassList },
       { switches::kAuthSchemes, prefs::kAuthSchemes },
       { switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist },
       { switches::kAuthNegotiateDelegateWhitelist,
           prefs::kAuthNegotiateDelegateWhitelist },
       { switches::kGSSAPILibraryName, prefs::kGSSAPILibraryName },
 };
 
 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
     CommandLinePrefStore::boolean_switch_map_[] = {
-      { switches::kNoProxyServer, prefs::kNoProxyServer, true },
-      { switches::kProxyAutoDetect, prefs::kProxyAutoDetect, true },
       { switches::kDisableAuthNegotiateCnameLookup,
           prefs::kDisableAuthNegotiateCnameLookup, true },
       { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort,
           true },
 };
 
 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line)
     : command_line_(command_line) {
   ApplySimpleSwitches();
+  ApplyProxySwitches();
   ValidateProxySwitches();
 }
 
 CommandLinePrefStore::~CommandLinePrefStore() {}
 
 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) {
     if (command_line_->HasSwitch(string_switch_map_[i].switch_name)) {
       Value* value = Value::CreateStringValue(command_line_->
@@ skipping 16 matching lines @@
       (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::ApplyProxySwitches() {
+  if (command_line_->HasSwitch(switches::kNoProxyServer)) {
+    SetValue(prefs::kProxyServerMode,
+             Value::CreateIntegerValue(PrefProxyConfigService::DISABLED));
+  } else if (command_line_->HasSwitch(switches::kProxyAutoDetect)) {
+    SetValue(prefs::kProxyServerMode,
+             Value::CreateIntegerValue(PrefProxyConfigService::AUTO_DETECT));
+  } else if (command_line_->HasSwitch(switches::kProxyServer) ||
+       command_line_->HasSwitch(switches::kProxyPacUrl) ||
+       command_line_->HasSwitch(switches::kProxyBypassList)) {
+    SetValue(prefs::kProxyServerMode,
+             Value::CreateIntegerValue(PrefProxyConfigService::MANUAL));
+  }

[danno, 2010/12/14 12:48:17]

validation and warning of conflicting switches since you now have more stringent
assumptions about their interaction?

[gfeher, 2010/12/16 10:42:04]

This happens in ValidateProxySwitches. It looks to me that it still does the
right thing.

+}