Print an error when trying to launch an incognito browser and incognito is disabled.

chrome/browser/ui/browser_init.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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 521 matching lines @@
     // because the page load can happen in parallel to this UI thread
     // and IO thread may access the NetworkStateNotifier.
     chromeos::CrosLibrary::Get()->GetNetworkLibrary()
         ->AddNetworkManagerObserver(
             chromeos::NetworkStateNotifier::GetInstance());
   }
 #endif
 
   // Continue with the incognito profile from here on if --incognito
   if ((command_line.HasSwitch(switches::kIncognito) ||
-       profile->GetPrefs()->GetBoolean(prefs::kIncognitoForced)) &&
-      profile->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled)) {
-    profile = profile->GetOffTheRecordProfile();
+       profile->GetPrefs()->GetBoolean(prefs::kIncognitoForced))) {
+    if (profile->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled)) {
+      profile = profile->GetOffTheRecordProfile();
+    } else {
+      LOG(ERROR) << "Incognito mode disabled by policy, launching a normal "

[sky, 2011/08/08 14:01:50]

At best this should be a warning, not an error.

[Joao da Silva, 2011/08/08 17:34:40]

Done.

+                 << "browser session.";
+    }
   }
 
   BrowserInit::LaunchWithProfile lwp(cur_dir, command_line, this);
   std::vector<GURL> urls_to_launch = BrowserInit::GetURLsFromCommandLine(
       command_line, cur_dir, profile);
   bool launched = lwp.Launch(profile, urls_to_launch, process_startup);
   in_startup = false;
 
   if (!launched) {
     LOG(ERROR) << "launch error";
@@ skipping 887 matching lines @@
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }