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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 11624036: Move the parsing of homepage_url" and "devtools_page" out of Extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years 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/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index eb60f9523fd2d533c6b2cb0182ce362273535f6c..c180d61e20042aadbcbfa011f434ade1e6aa57f1 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -19,10 +19,13 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/content_settings_pattern.h"
+#include "chrome/common/extensions/api/url_parser/devtools_page_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/extension_process_policy.h"
#include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/extensions/manifest_handler.h"
#include "chrome/common/external_ipc_fuzzer.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/localized_error.h"
@@ -117,6 +120,14 @@ using WebKit::WebVector;
namespace {
+// Explicitly register all ManifestHandlers, since the subprocess won't have the
+// same ManifestHandlerRegistry.
+void RegisterManifestHandlers() {
Yoyo Zhou 2012/12/27 17:16:17 This should probably be called RegisterExtensionMa
Joe Thomas 2012/12/30 04:26:00 Done.
+ extensions::ManifestHandler::Register(
+ extension_manifest_keys::kDevToolsPage,
+ new extensions::DevToolsPageHandler);
+}
+
static void AppendParams(const std::vector<string16>& additional_names,
const std::vector<string16>& additional_values,
WebVector<WebString>* existing_names,
@@ -258,6 +269,8 @@ void ChromeContentRendererClient::RenderThreadStarted() {
extension_scheme);
WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
extension_resource_scheme);
+
+ RegisterManifestHandlers();
}
void ChromeContentRendererClient::RenderViewCreated(

Powered by Google App Engine
This is Rietveld 408576698