chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 16104008: First try at a user management screen for the desktop

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 16104008: First try at a user management screen for the desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase and review comments Created 7 years, 6 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

« chrome/browser/profiles/profile_manager.cc ('K') | « chrome/browser/resources/user_chooser/user_chooser.js ('k') | chrome/browser/ui/webui/signin/user_chooser_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

index 4bcecf74f60abe372896b43cc61222b580afec0a..e3cd7aa9ca42aef1d5d3c52895292307e4dced6c 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -45,6 +45,7 @@

#include "chrome/browser/ui/webui/profiler_ui.h"

#include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"

#include "chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h"

+#include "chrome/browser/ui/webui/signin/user_chooser_ui.h"

#include "chrome/browser/ui/webui/signin_internals_ui.h"

#include "chrome/browser/ui/webui/sync_internals_ui.h"

#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"

@@ -385,6 +386,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<keyboard::KeyboardUIController>;

#endif

+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)

+ if (url.host() == chrome::kChromeUIUserChooserHost &&

+ CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kNewProfileManagement))

+ return &NewWebUI<UserChooserUI>;

+#endif

if (url.host() == chrome::kChromeUIChromeURLsHost ||

url.host() == chrome::kChromeUICreditsHost ||

url.host() == chrome::kChromeUIDNSHost ||