Converted IncognitoForced boolean policy into IncognitoModeAvailability enum policy.

chrome/browser/prefs/command_line_pref_store.cc

 // Copyright (c) 2011 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 "base/logging.h"
 #include "base/string_split.h"
 #include "base/values.h"
+#include "chrome/browser/prefs/incognito_mode_availability_prefs.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/ui_base_switches.h"
 
 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry
     CommandLinePrefStore::string_switch_map_[] = {
       { switches::kLang, prefs::kApplicationLocale },
       { switches::kAuthSchemes, prefs::kAuthSchemes },
       { switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist },
@@ skipping 15 matching lines @@
       { switches::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize,
           true },
       { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false },
       { switches::kNoReferrers, prefs::kEnableReferrers, false },
       { switches::kAllowRunningInsecureContent,
         prefs::kWebKitAllowRunningInsecureContent, true },
       { switches::kNoDisplayingInsecureContent,
         prefs::kWebKitAllowDisplayingInsecureContent, false },
       { switches::kAllowCrossOriginAuthPrompt,
         prefs::kAllowCrossOriginAuthPrompt, true },
-      { switches::kIncognito, prefs::kIncognitoForced, true },
 };
 
 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line)
     : command_line_(command_line) {
   ApplySimpleSwitches();
   ApplyProxyMode();
   ValidateProxySwitches();
   ApplySSLSwitches();
+  ApplyIncognitoSwitches();
 }
 
 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_->
           GetSwitchValueASCII(string_switch_map_[i].switch_name));
@@ skipping 53 matching lines @@
     std::vector<std::string> cipher_strings;
     base::SplitString(cipher_suites, ',', &cipher_strings);
     base::ListValue* list_value = new base::ListValue();
     for (std::vector<std::string>::const_iterator it = cipher_strings.begin();
          it != cipher_strings.end(); ++it) {
       list_value->Append(base::Value::CreateStringValue(*it));
     }
     SetValue(prefs::kCipherSuiteBlacklist, list_value);
   }
 }
+
+void CommandLinePrefStore::ApplyIncognitoSwitches() {
+  if (command_line_->HasSwitch(switches::kIncognito)) {
+    SetValue(prefs::kIncognitoModeAvailability,
+             Value::CreateIntegerValue(IncognitoModeAvailabilityPrefs::FORCED));

[Bernhard Bauer, 2011/07/28 11:34:03]

The --incognito flag opens the first window in incognito mode, but doesn't force
other windows into incognito mode. Here you're changing that behavior.

[rustema, 2011/07/29 06:49:23]

This is now gone.

+  }
+}