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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 9500003: Add a button to exit managed mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 8 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/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index ec6fd54e6135e2637e58c7f72f51cdf95bfa0d0e..5bf62141bf801bbbdea2a5376f99292bc2186ea0 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -16,6 +16,7 @@
#include "chrome/browser/bookmarks/bookmark_editor.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/instant/instant_controller.h"
+#include "chrome/browser/managed_mode.h"
#include "chrome/browser/profiles/avatar_menu_model.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_info_cache.h"
@@ -1404,8 +1405,10 @@ enum {
- (BOOL)shouldShowAvatar {
if (![self hasTabStrip])
return NO;
- if (browser_->profile()->IsOffTheRecord())
+ if (browser_->profile()->IsOffTheRecord() ||
+ ManagedMode::IsInManagedMode()) {
return YES;
+ }
ProfileInfoCache& cache =
g_browser_process->profile_manager()->GetProfileInfoCache();

Powered by Google App Engine
This is Rietveld 408576698