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

Unified Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

Issue 856733004: Loading the Launcher with a Locked Profile launched UserManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ProfileLocked check. Add unit test. Created 5 years, 11 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/webui/signin/user_manager_screen_handler.cc
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
index 7dc3575dcc8b0f4a946d61232958f7a7ee844055..6ad8b25e1cf7037d6efd3689e1239c5813eb8388 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/profiles/profile_window.h"
#include "chrome/browser/profiles/profiles_state.h"
#include "chrome/browser/signin/local_auth.h"
+#include "chrome/browser/ui/app_list/app_list_service.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -148,6 +149,11 @@ bool IsAddPersonEnabled() {
return service->GetBoolean(prefs::kBrowserAddPersonEnabled);
}
+void ShowAppList(Browser* browser, chrome::HostDesktopType desktop_type) {
+ AppListService* app_list_service = AppListService::Get(desktop_type);
+ app_list_service->ShowForProfile(browser->profile());
+}
+
} // namespace
// ProfileUpdateObserver ------------------------------------------------------
@@ -730,6 +736,9 @@ void UserManagerScreenHandler::OnBrowserWindowReady(Browser* browser) {
} else if (url_hash_ == profiles::kUserManagerSelectProfileChromeMemory) {
base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(&chrome::ShowMemory, browser));
+ } else if (url_hash_ == profiles::kUserManagerSelectProfileAppLauncher) {
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(&ShowAppList, browser, desktop_type_));
sky 2015/01/22 18:26:15 How do you know browser is still valid by the time
Mike Lerman 2015/01/23 16:58:33 It just got created and there's nothing that shoul
sky 2015/01/23 17:55:04 Yes, the object just got got created (object being
Mike Lerman 2015/01/23 18:21:03 For the Profile, we should be safe, since the Prof
}
// This call is last as it deletes this object.

Powered by Google App Engine
This is Rietveld 408576698