Supervised users: if history recording is off, allow incognito and deleting history

chrome/browser/ui/toolbar/wrench_menu_model.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index cedb29767146d6c5ce194e2507186d567665edef..4057b53bd82945580a5dee4cd2d48e7e46e89718 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/extension_util.h"
+#include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search/search.h"
@@ -517,10 +518,11 @@ WrenchMenuModel::WrenchMenuModel()
 }
 
 bool WrenchMenuModel::ShouldShowNewIncognitoWindowMenuItem() {
-  if (browser_->profile()->IsSupervised())
+  if (browser_->profile()->IsGuestSession())
     return false;
 
-  return !browser_->profile()->IsGuestSession();
+  return IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=

[msw, 2014/11/06 19:08:03]

I thought there was some older discussion to making this the canonical way to
check for incognito availability, so that guest session profiles would return
false for that, and you could avoid the check above.

[Marc Treib, 2014/11/07 10:16:42]

Right now, this returns ENABLED for guest profiles; see
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/pro...
and
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...
According to that TODO, making IncognitoModePrefs work correctly for guests
seems to be ongoing work.

+      IncognitoModePrefs::DISABLED;
 }
 
 void WrenchMenuModel::Build() {