Implement pref policy for disabling incognito mode.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc	(revision 72320)
+++ chrome/browser/ui/browser.cc	(working copy)
@@ -225,6 +225,8 @@
     printing_enabled_.Init(prefs::kPrintingEnabled, local_state, this);
   dev_tools_disabled_.Init(prefs::kDevToolsDisabled,
                            profile_->GetPrefs(), this);
+  incognito_mode_allowed_.Init(prefs::kIncognitoEnabled,
+                               profile_->GetPrefs(), this);

[Finnur, 2011/01/26 13:23:38]

Daniel/Matthias: I checked this in after the try servers went green and the tree
lit up light a Christmas tree due to crashes in tests (a NOTREACHED).

Then I commented out everything in this CL except the pref definition consts and
left these two lines above in but it still crashes. If I comment these two lines
out, then the tests pass.

The NOTREACHED I'm seeing is in
BookmarkBarView::BookmarkModelBeingDeleted

  // In normal shutdown The bookmark model should never be deleted before us.
  // When X exits suddenly though, it can happen, This code exists
  // to check for regressions in shutdown code and not crash.
  if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers())
    NOTREACHED();

The thing is that ShuttingDownWithoutClosingBrowsers() always returns false,
except on certain scenarios on Linux. 

This makes no sense... Have you guys seen anything like this? Why is adding one
more Init pref call here so disastrous??

[Finnur, 2011/01/26 13:44:35]

Hmm... I believe this is because of a missing Destroy() for the pref I Init...

On 2011/01/26 13:23:38, Finnur wrote:

 
   InitCommandState();
   BrowserList::AddBrowser(this);
@@ -1287,7 +1289,8 @@
 
 void Browser::NewWindow() {
   if (browser_defaults::kAlwaysOpenIncognitoWindow &&
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kIncognito)) {
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kIncognito) &&
+      incognito_mode_allowed_.GetValue()) {
     NewIncognitoWindow();
     return;
   }
@@ -1301,6 +1304,11 @@
 }
 
 void Browser::NewIncognitoWindow() {
+  if (!incognito_mode_allowed_.GetValue()) {
+    NewWindow();
+    return;
+  }
+
   UserMetrics::RecordAction(UserMetricsAction("NewIncognitoWindow"), profile_);
   Browser::OpenEmptyWindow(profile_->GetOffTheRecordProfile());
 }
@@ -1929,7 +1937,7 @@
       switches::kDisableTabbedOptions)) {
     ShowOptionsTab(chrome::kLanguageOptionsSubPage);
   } else {
-   // Language options dialog has been replaced by DOMUI.
+    // Language options dialog has been replaced by DOMUI.
   }
 }
 
@@ -2025,6 +2033,7 @@
   prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false);
   prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
   prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
+  prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, true);
   prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0);
   prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
   // We need to register the type of this preference in order to query
@@ -3428,7 +3437,8 @@
 
   // Window management commands
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW, true);
-  command_updater_.UpdateCommandEnabled(IDC_NEW_INCOGNITO_WINDOW, true);
+  command_updater_.UpdateCommandEnabled(IDC_NEW_INCOGNITO_WINDOW,
+                                        incognito_mode_allowed_.GetValue());
   command_updater_.UpdateCommandEnabled(IDC_CLOSE_WINDOW, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_TAB, true);
   command_updater_.UpdateCommandEnabled(IDC_CLOSE_TAB, true);