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

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

Issue 631163004: Mac - show user manager before opening browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use different app_controller_mac method. use different TaskMgr call. Created 6 years, 2 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 7512ce809639c30c20543ff91f791516314248fd..f15af938afe5dee32fe7a4fd9b0af3ccb91ff103 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/browser_commands.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
@@ -32,6 +33,7 @@
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/notification_service.h"
+#include "content/public/browser/user_metrics.h"
Mark Mentovai 2014/10/08 16:43:22 No longer necessary.
Mike Lerman 2014/10/08 20:23:41 Indeed.
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "google_apis/gaia/gaia_auth_fetcher.h"
@@ -717,11 +719,14 @@ void UserManagerScreenHandler::OnBrowserWindowReady(Browser* browser) {
DCHECK(browser);
DCHECK(browser->window());
if (url_hash_ == profiles::kUserManagerSelectProfileTaskManager) {
- base::MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(&chrome::ShowTaskManager, browser));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(&chrome::OpenTaskManager, browser));
} else if (url_hash_ == profiles::kUserManagerSelectProfileAboutChrome) {
- base::MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(&chrome::ShowAboutChrome, browser));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(&chrome::ShowAboutChrome, browser));
+ } else if (url_hash_ == profiles::kUserManagerSelectProfileChromeSettings) {
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(&chrome::ShowSettings, browser));
}
// This call is last as it deletes this object.
« chrome/browser/app_controller_mac.mm ('K') | « chrome/browser/ui/views/profiles/user_manager_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698