Prevent incognito windows from opening when incognito mode is disabled.

chrome/browser/extensions/extension_tabs_module.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/extensions/extension_tabs_module.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 369 matching lines @@
     }
 
     if (args->HasKey(keys::kHeightKey)) {
       EXTENSION_FUNCTION_VALIDATE(args->GetInteger(keys::kHeightKey,
                                                    &bounds_val));
       window_bounds.set_height(bounds_val);
       popup_bounds.set_height(bounds_val);
       panel_bounds.set_height(bounds_val);
     }
 
+    const IncognitoModePrefs::Availability incognito_avail =

[Finnur, 2011/10/24 10:08:08]

nit: Please don't abbreviate the variable names.

[rustema, 2011/10/25 03:35:17]

Done.

+        IncognitoModePrefs::GetAvailability(profile_->GetPrefs());
     bool incognito = false;
     if (args->HasKey(keys::kIncognitoKey)) {
       EXTENSION_FUNCTION_VALIDATE(args->GetBoolean(keys::kIncognitoKey,
                                                    &incognito));
-      if (IncognitoModePrefs::GetAvailability(profile_->GetPrefs()) ==
-          IncognitoModePrefs::DISABLED) {
-        error_ = keys::kIncognitoModeIsDisabled;
-        return false;
-      }
-
       if (incognito) {
+        if (incognito_avail == IncognitoModePrefs::DISABLED) {
+          error_ = keys::kIncognitoModeIsDisabled;
+          return false;
+        }
         std::string first_url_erased;
         // Guest session is an exception as it always opens in incognito mode.
         for (size_t i = 0; i < urls.size();) {
           if (browser::IsURLAllowedInIncognito(urls[i]) &&
               !Profile::IsGuestSession()) {
             if (first_url_erased.empty())
               first_url_erased = urls[i].spec();
             urls.erase(urls.begin() + i);
           } else {
             i++;
           }
         }
         if (urls.empty() && !first_url_erased.empty()) {
           error_ = ExtensionErrorUtils::FormatErrorMessage(
               keys::kURLsNotAllowedInIncognitoError, first_url_erased);
           return false;
         }
         window_profile = window_profile->GetOffTheRecordProfile();
       }
     }
+    if (!incognito && incognito_avail == IncognitoModePrefs::FORCED) {
+      error_ = keys::kIncognitoModeIsForced;
+      return false;
+    }
 
     if (args->HasKey(keys::kFocusedKey)) {
       EXTENSION_FUNCTION_VALIDATE(args->GetBoolean(keys::kFocusedKey,
                                                    &focused));
       saw_focus_key = true;
     }
 
     std::string type_str;
     if (args->HasKey(keys::kWindowTypeKey)) {
       EXTENSION_FUNCTION_VALIDATE(args->GetString(keys::kWindowTypeKey,
@@ skipping 1107 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }