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

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

Issue 1080163002: Add new chrome://proximity-auth WebUI for debugging Smart Lock. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 5 years, 8 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/webui/DEPS ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 023af7a92519a3c29d60d3e01bc7ab73c18f3f07..7f36c0182d07dde0d194c62d93f7a27c4ccf8a5c 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -21,7 +21,6 @@
#include "chrome/browser/ui/webui/bookmarks_ui.h"
#include "chrome/browser/ui/webui/components_ui.h"
#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
-#include "chrome/browser/ui/webui/copresence_ui.h"
#include "chrome/browser/ui/webui/crashes_ui.h"
#include "chrome/browser/ui/webui/device_log_ui.h"
#include "chrome/browser/ui/webui/domain_reliability_internals_ui.h"
@@ -104,8 +103,11 @@
#include "chrome/browser/ui/webui/net_export_ui.h"
#else
#include "chrome/browser/devtools/device/webrtc/webrtc_device_provider.h"
+#include "chrome/browser/ui/webui/copresence_ui.h"
#include "chrome/browser/ui/webui/devtools_ui.h"
#include "chrome/browser/ui/webui/inspect_ui.h"
+#include "components/proximity_auth/webui/proximity_auth_ui.h"
+#include "components/proximity_auth/webui/url_constants.h"
#endif
#if defined(OS_CHROMEOS)
@@ -432,12 +434,16 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<KeyboardOverlayUI>;
if (url.host() == chrome::kChromeUIMobileSetupHost)
return &NewWebUI<MobileSetupUI>;
+ if (url.host() == chrome::kChromeUINetworkHost)
+ return &NewWebUI<chromeos::NetworkUI>;
if (url.host() == chrome::kChromeUINfcDebugHost)
return &NewWebUI<chromeos::NfcDebugUI>;
if (url.host() == chrome::kChromeUIOobeHost)
return &NewWebUI<chromeos::OobeUI>;
if (url.host() == chrome::kChromeUIOobeMdHost)
return &NewWebUI<OobeMdUI>;
+ if (url.host() == chrome::kChromeUIPowerHost)
+ return &NewWebUI<chromeos::PowerUI>;
if (url.host() == chrome::kChromeUIProvidedFileSystemsHost)
return &NewWebUI<chromeos::ProvidedFileSystemsUI>;
if (url.host() == chrome::kChromeUIProxySettingsHost)
@@ -452,10 +458,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<chromeos::SlowUI>;
if (url.host() == chrome::kChromeUISlowTraceHost)
return &NewWebUI<chromeos::SlowTraceController>;
- if (url.host() == chrome::kChromeUINetworkHost)
- return &NewWebUI<chromeos::NetworkUI>;
- if (url.host() == chrome::kChromeUIPowerHost)
- return &NewWebUI<chromeos::PowerUI>;
#endif // defined(OS_CHROMEOS)
#if defined(OS_ANDROID) || defined(OS_IOS)
if (url.host() == chrome::kChromeUINetExportHost)
@@ -467,6 +469,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<InlineLoginUI>;
if (url.SchemeIs(content::kChromeDevToolsScheme))
return &NewWebUI<DevToolsUI>;
+ if (url.host() == proximity_auth::kChromeUIProximityAuthHost)
+ return &NewWebUI<proximity_auth::ProximityAuthUI>;
if (url.host() == chrome::kChromeUIWebRTCDeviceProviderHost)
return &NewWebUI<WebRTCDeviceProvider::WebUI>;
« no previous file with comments | « chrome/browser/ui/webui/DEPS ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698