Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4237)

Unified Diff: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

Issue 422443008: New avatar menu: Don't show "Go incognito" if incognito is disabled by policy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mac Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
index 8824fd8f3791d8234a1ddc0ab8d1951c3c89c16e..68cfd1a28bd0d8e134af9d2def4fe66afd652f59 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
@@ -13,6 +13,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/avatar_menu.h"
#include "chrome/browser/profiles/avatar_menu_observer.h"
#include "chrome/browser/profiles/profile_avatar_icon_util.h"
@@ -775,6 +776,8 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
title:(const std::string&)title
tag:(int)tag
reauthRequired:(BOOL)reauthRequired;
+
+- (bool)shouldShowGoIncognito;
@end
@implementation ProfileChooserController
@@ -801,7 +804,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
}
- (IBAction)goIncognito:(id)sender {
- DCHECK(!browser_->profile()->IsGuestSession());
+ DCHECK([self shouldShowGoIncognito]);
chrome::NewIncognitoWindow(browser_);
}
@@ -1521,7 +1524,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
viewRect.origin.y = NSMaxY([separator frame]);
}
- if (!isGuestSession_) {
+ if ([self shouldShowGoIncognito]) {
// TODO(noms): Use the correct incognito icon when it's available.
NSButton* goIncognitoButton =
[self hoverButtonWithRect:viewRect
@@ -1938,4 +1941,11 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
serviceType_ = signin::GAIA_SERVICE_TYPE_NONE;
}
+- (bool)shouldShowGoIncognito {
+ bool incognitoAvailable =
+ IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
+ IncognitoModePrefs::DISABLED;
+ return incognitoAvailable && !browser_->profile()->IsGuestSession();
+}
+
@end

Powered by Google App Engine
This is Rietveld 408576698