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

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

Issue 10544195: Show an extension info bubble when a script badge is clicked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase eh Created 8 years, 6 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 eaec62e3b65da8abaeea76e30ea576b1fb0d48f2..b2a3db71c62a4ab73d23bc0ffdca8074ade673eb 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"
@@ -50,6 +51,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"
@@ -106,13 +108,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) {
@@ -347,6 +355,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
switches::kEnableExtensionActivityUI)) {
return &NewWebUI<ExtensionActivityUI>;
}
+ if (url.host() == chrome::kChromeUIExtensionInfoHost &&
+ extensions::switch_utils::AreScriptBadgesEnabled()) {
+ return &NewWebUI<ExtensionInfoUI>;
+ }
DLOG(WARNING) << "Unknown WebUI:" << url;
return NULL;
« no previous file with comments | « chrome/browser/ui/views/location_bar/page_action_image_view.cc ('k') | chrome/browser/ui/webui/extensions/extension_info_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698