chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 22914008: Refactor kiosk app launch to be part of login screen UI flow.

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 22914008: Refactor kiosk app launch to be part of login screen UI flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 4 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:

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 dc367c52340a1f47a082e77b8fd70fd511326d37..f097d810660c42a3043ab213d17c957fab2dad93 100644

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

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

@@ -92,7 +92,6 @@

#endif

#if defined(OS_CHROMEOS)

-#include "chrome/browser/ui/webui/chromeos/app_launch_ui.h"

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

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

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

@@ -348,8 +347,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<CertificateViewerUI>;

#endif

#if defined(OS_CHROMEOS)

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

- return &NewWebUI<chromeos::AppLaunchUI>;

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

return &NewWebUI<chromeos::BluetoothPairingUI>;

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