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

Unified Diff: chrome/browser/ui/browser.cc

Issue 9500003: Add a button to exit managed mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index cdeb0f8f94060d522702163385346e050b47d066..adbd799ba80e0feb9117e21ffb224c2950ce2875 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -425,6 +425,7 @@ Browser::Browser(Type type, Profile* profile)
local_pref_registrar_.Add(prefs::kPrintingEnabled, this);
local_pref_registrar_.Add(prefs::kAllowFileSelectionDialogs, this);
local_pref_registrar_.Add(prefs::kMetricsReportingEnabled, this);
+ local_pref_registrar_.Add(prefs::kInManagedMode, this);
}
profile_pref_registrar_.Init(profile_->GetPrefs());
@@ -4266,6 +4267,8 @@ void Browser::Observe(int type,
} else if (pref_name == prefs::kAllowFileSelectionDialogs) {
UpdateSaveAsState(GetContentRestrictionsForSelectedTab());
UpdateOpenFileState();
+ } else if (pref_name == prefs::kInManagedMode) {
+ UpdateCommandsForMultipleProfiles();
} else {
NOTREACHED();
}
@@ -4688,13 +4691,20 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
command_updater_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, show_main_ui);
command_updater_.UpdateCommandEnabled(IDC_ABOUT, show_main_ui);
command_updater_.UpdateCommandEnabled(IDC_SHOW_APP_MENU, show_main_ui);
- command_updater_.UpdateCommandEnabled(IDC_SHOW_AVATAR_MENU,
- show_main_ui && !profile()->IsOffTheRecord());
#if defined (ENABLE_PROFILING) && !defined(NO_TCMALLOC)
command_updater_.UpdateCommandEnabled(IDC_PROFILING_ENABLED, show_main_ui);
#endif
UpdateCommandsForBookmarkBar();
+ UpdateCommandsForMultipleProfiles();
+}
+
+void Browser::UpdateCommandsForMultipleProfiles() {
+ bool show_main_ui = IsShowingMainUI(window_ && window_->IsFullscreen());
+ command_updater_.UpdateCommandEnabled(IDC_SHOW_AVATAR_MENU,
+ show_main_ui &&
+ !profile()->IsOffTheRecord() &&
+ ProfileManager::IsMultipleProfilesEnabled());
}
void Browser::UpdatePrintingState(int content_restrictions) {

Powered by Google App Engine
This is Rietveld 408576698