diff options
| author | noms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 19:43:38 +0000 |
|---|---|---|
| committer | noms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 19:43:38 +0000 |
| commit | 94840bb59a8403c04cfb0a2c05da00f7c7caf1a3 (patch) | |
| tree | d69676d0d8a9d693da93ca70f63e6c8db2b92749 /chrome/browser/browser_process_impl.cc | |
| parent | 5a6b024c782c1dc5ce6be088496508dd8ec61d70 (diff) | |
| download | chromium_src-94840bb59a8403c04cfb0a2c05da00f7c7caf1a3.zip chromium_src-94840bb59a8403c04cfb0a2c05da00f7c7caf1a3.tar.gz chromium_src-94840bb59a8403c04cfb0a2c05da00f7c7caf1a3.tar.bz2 | |
[Mac] User manager should show up as a standalone window.
BUG=324040
TEST=With the --new-profile-management flag on, start Chrome and click the avatar button. Select "View All Users". This should bring up the User Manager in a new, top-level window.
Review URL: https://codereview.chromium.org/102913002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 74597c3..a79c5c2 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -60,6 +60,7 @@ #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/profiles/profiles_state.h" #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/shell_integration.h" @@ -67,6 +68,7 @@ #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h" #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h" +#include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/web_resource/promo_resource_service.h" #include "chrome/common/chrome_constants.h" @@ -248,6 +250,10 @@ void BrowserProcessImpl::StartTearDown() { { TRACE_EVENT0("shutdown", "BrowserProcessImpl::StartTearDown:ProfileManager"); + // The desktop User Manager needs to be closed before the guest profile + // can be destroyed. + if (profiles::IsNewProfileManagementEnabled()) + chrome::HideUserManager(); profile_manager_.reset(); } |