| 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 e1764bdc413b3c421e5981603e79627a96a191f7..29b624638582915f2f809ea2fc4ee905c964ecb2 100644
|
| --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
| +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
| @@ -21,6 +21,7 @@
|
| #include "chrome/browser/ui/webui/devtools_ui.h"
|
| #include "chrome/browser/ui/webui/downloads_ui.h"
|
| #include "chrome/browser/ui/webui/extensions/extension_activity_ui.h"
|
| +#include "chrome/browser/ui/webui/extensions/extension_info_ui.h"
|
| #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
|
| #include "chrome/browser/ui/webui/feedback_ui.h"
|
| #include "chrome/browser/ui/webui/flags_ui.h"
|
| @@ -49,6 +50,7 @@
|
| #include "chrome/browser/ui/webui/uber/uber_ui.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| +#include "chrome/common/extensions/extension_switch_utils.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "content/public/browser/web_contents.h"
|
| @@ -105,13 +107,19 @@ WebUIController* NewWebUI(WebUI* web_ui, const GURL& url) {
|
| return new T(web_ui);
|
| }
|
|
|
| -// Special case for extensions.
|
| +// Special cases for extensions.
|
| template<>
|
| WebUIController* NewWebUI<ExtensionWebUI>(WebUI* web_ui,
|
| const GURL& url) {
|
| return new ExtensionWebUI(web_ui, url);
|
| }
|
|
|
| +template<>
|
| +WebUIController* NewWebUI<ExtensionInfoUI>(WebUI* web_ui,
|
| + const GURL& url) {
|
| + return new ExtensionInfoUI(web_ui, url);
|
| +}
|
| +
|
| // Special case for older about: handlers.
|
| template<>
|
| WebUIController* NewWebUI<AboutUI>(WebUI* web_ui, const GURL& url) {
|
| @@ -344,6 +352,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
| switches::kEnableExtensionActivityUI)) {
|
| return &NewWebUI<ExtensionActivityUI>;
|
| }
|
| + if (url.host() == chrome::kChromeUIExtensionInfoHost &&
|
| + extensions::switch_utils::IsActionBoxEnabled()) {
|
| + return &NewWebUI<ExtensionInfoUI>;
|
| + }
|
|
|
| DLOG(WARNING) << "Unknown WebUI:" << url;
|
| return NULL;
|
|
|