diff options
| author | mlerman <mlerman@chromium.org> | 2014-09-24 12:31:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 19:31:36 +0000 |
| commit | e29d00321d1b5ef5d46097d94f3a4a8be7029ec2 (patch) | |
| tree | 829a0f760f17490f374d6470fa78fea5f2ec4f84 /chrome/browser/browser_process_impl.cc | |
| parent | efcbfea7efbf5488fa6b602b5960e4d9c59a5361 (diff) | |
| download | chromium_src-e29d00321d1b5ef5d46097d94f3a4a8be7029ec2.zip chromium_src-e29d00321d1b5ef5d46097d94f3a4a8be7029ec2.tar.gz chromium_src-e29d00321d1b5ef5d46097d94f3a4a8be7029ec2.tar.bz2 | |
Access to Chrome via the System Tray should go through the User Manager.
If the most recent profile is locked and the user uses the Windows
system tray to access the Task Manager or About Chrome, the user will
now first be presented with the User Manager, and only after selecting
or unlocking a profile will they be brought automatically to their
original destination.
BUG=409030
TEST=Enable --new-profile-management. Have at least one background app
running under your profile (e.g. Hangouts). Close Chrome. In the
system tray, Chrome ->Task Manager or About Chrome. Only after unlocking
your profile or opening a new profile, you'll see the original selection.
Review URL: https://codereview.chromium.org/564453003
Cr-Commit-Position: refs/heads/master@{#296489}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index d5cb3ad..b093cb4 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -63,6 +63,7 @@ #include "chrome/browser/ui/apps/chrome_app_window_client.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/user_manager.h" #include "chrome/browser/web_resource/promo_resource_service.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -255,7 +256,7 @@ void BrowserProcessImpl::StartTearDown() { // The desktop User Manager needs to be closed before the guest profile // can be destroyed. if (switches::IsNewAvatarMenu()) - chrome::HideUserManager(); + UserManager::Hide(); profile_manager_.reset(); } |