chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 1536553002: Remove InlineLoginHandlerChromeOS and exclude InlineLoginUI from CrOS build.

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 1536553002: Remove InlineLoginHandlerChromeOS and exclude InlineLoginUI from CrOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge conflicts resolved. Created 4 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

« no previous file with comments | « chrome/browser/ui/views/profiles/signin_view_controller.cc ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('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 3a460f3fb372adfcd947c6f0535a3aa00ac05b0f..09f0f63137265ee0ecd41aa81945b04d3053e2ed 100644

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

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

@@ -51,10 +51,7 @@

#include "chrome/browser/ui/webui/predictors/predictors_ui.h"

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

#include "chrome/browser/ui/webui/settings/md_settings_ui.h"

-#include "chrome/browser/ui/webui/signin/inline_login_ui.h"

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

-#include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"

-#include "chrome/browser/ui/webui/signin/user_manager_ui.h"

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

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

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

@@ -127,6 +124,12 @@

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

#endif

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

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

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

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

+#endif

#if defined(OS_CHROMEOS)

#include "base/sys_info.h"

#include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h"

@@ -493,8 +496,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

#else

if (url.host() == chrome::kChromeUICopresenceHost)

return &NewWebUI<CopresenceUI>;

- if (url.host() == chrome::kChromeUIChromeSigninHost)

- return &NewWebUI<InlineLoginUI>;

if (url.SchemeIs(content::kChromeDevToolsScheme))

return &NewWebUI<DevToolsUI>;

@@ -509,6 +510,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<PopularSitesInternalsUI>;

#endif

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

+ if (url.host() == chrome::kChromeUIChromeSigninHost)

+ return &NewWebUI<InlineLoginUI>;

if (url.host() == chrome::kChromeUIUserManagerHost)

return &NewWebUI<UserManagerUI>;

if (url.host() == chrome::kChromeUISyncConfirmationHost)