Chromium Code Reviews| Index: content/browser/webui/web_ui_controller_factory_registry.cc |
| diff --git a/content/browser/webui/web_ui_controller_factory_registry.cc b/content/browser/webui/web_ui_controller_factory_registry.cc |
| index f4d65aa85a728f4ba6e386c1849d712040561215..2b8299f0e16c01d411f4ad6ba026fa79fc261ede 100644 |
| --- a/content/browser/webui/web_ui_controller_factory_registry.cc |
| +++ b/content/browser/webui/web_ui_controller_factory_registry.cc |
| @@ -5,6 +5,7 @@ |
| #include "content/browser/webui/web_ui_controller_factory_registry.h" |
| #include "base/lazy_instance.h" |
| +#include "content/browser/frame_host/debug_urls.h" |
| #include "content/public/common/url_constants.h" |
| #include "url/gurl.h" |
| @@ -80,16 +81,11 @@ bool WebUIControllerFactoryRegistry::IsURLAcceptableForWebUI( |
| BrowserContext* browser_context, |
| const GURL& url) const { |
| return UseWebUIForURL(browser_context, url) || |
| - // javascript: URLs are allowed to run in Web UI pages. |
| - url.SchemeIs(kJavaScriptScheme) || |
| // It's possible to load about:blank in a Web UI renderer. |
| // See http://crbug.com/42547 |
| url.spec() == kAboutBlankURL || |
| - // Chrome URLs crash, kill, hang, and shorthang are allowed. |
| - url == GURL(kChromeUICrashURL) || |
| - url == GURL(kChromeUIKillURL) || |
| - url == GURL(kChromeUIHangURL) || |
| - url == GURL(kChromeUIShorthangURL); |
| + // javascript: and debug URLs liks chrome://kill are allowed. |
|
nasko
2014/02/12 23:27:29
nit: s/liks/like/
Charlie Reis
2014/02/12 23:41:26
Oops, thanks. Fixed.
|
| + IsRendererDebugURL(url); |
| } |
| WebUIControllerFactoryRegistry::WebUIControllerFactoryRegistry() { |