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

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: 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
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..b19d2f15aa4ec364c6a726aa10af82fb1f1e8285 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -130,6 +130,8 @@
#include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
#include "chrome/browser/ui/webui/chromeos/slow_trace_ui.h"
#include "chrome/browser/ui/webui/chromeos/slow_ui.h"
+#include "components/proximity_auth/webui/proximity_auth_ui.h"
+#include "components/proximity_auth/webui/proximity_auth_webui_constants.h"
#endif
#if defined(USE_AURA)
@@ -432,12 +434,18 @@ 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() == proximity_auth::kChromeUIProximityAuthHost)
+ return &NewWebUI<proximity_auth::ProximityAuthUI>;
if (url.host() == chrome::kChromeUIProvidedFileSystemsHost)
return &NewWebUI<chromeos::ProvidedFileSystemsUI>;
if (url.host() == chrome::kChromeUIProxySettingsHost)
@@ -452,10 +460,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)

Powered by Google App Engine
This is Rietveld 408576698