diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 18:27:14 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 18:27:14 +0000 |
| commit | 623294c447e00b7485092cdf68d50874a9f0646e (patch) | |
| tree | 53135e482180a848d3ab9b0a3643407f63c5b9cc /chrome/browser/ui/browser.cc | |
| parent | 61b4efcd2a24ed3862775093626247ebddc3f5f0 (diff) | |
| download | chromium_src-623294c447e00b7485092cdf68d50874a9f0646e.zip chromium_src-623294c447e00b7485092cdf68d50874a9f0646e.tar.gz chromium_src-623294c447e00b7485092cdf68d50874a9f0646e.tar.bz2 | |
Add a button to exit managed mode in place of the profile avatar.
BUG=116060
TEST=none
Review URL: http://codereview.chromium.org/9500003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.cc')
| -rw-r--r-- | chrome/browser/ui/browser.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 1dee07f..abc4049 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) { |