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

Unified Diff: chrome/renderer/extensions/dispatcher.cc

Issue 23292002: Don't expose document.register to Chrome Apps by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits Created 7 years, 4 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
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/extensions/document_custom_bindings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/dispatcher.cc
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index 0104244d0c7c385245ba5e99f1fc437523db92ec..999c89facf83f4c844f3ab7231414346a2aac770 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -43,6 +43,7 @@
#include "chrome/renderer/extensions/chrome_v8_extension.h"
#include "chrome/renderer/extensions/content_watcher.h"
#include "chrome/renderer/extensions/context_menus_custom_bindings.h"
+#include "chrome/renderer/extensions/document_custom_bindings.h"
#include "chrome/renderer/extensions/dom_activity_logger.h"
#include "chrome/renderer/extensions/event_bindings.h"
#include "chrome/renderer/extensions/extension_custom_bindings.h"
@@ -854,6 +855,9 @@ void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system,
module_system->RegisterNativeHandler("context_menus",
scoped_ptr<NativeHandler>(
new ContextMenusCustomBindings(this, context)));
+ module_system->RegisterNativeHandler("document_natives",
+ scoped_ptr<NativeHandler>(
+ new DocumentCustomBindings(this, context)));
module_system->RegisterNativeHandler("extension",
scoped_ptr<NativeHandler>(
new ExtensionCustomBindings(this, context)));
@@ -1291,11 +1295,11 @@ void Dispatcher::AddOrRemoveOriginPermissions(
}
void Dispatcher::EnableCustomElementWhiteList() {
- WebKit::WebRuntimeFeatures::enableCustomElements(true);
- WebKit::WebCustomElement::allowTagName("webview");
+ WebKit::WebRuntimeFeatures::enableEmbedderCustomElements(true);
+ WebKit::WebCustomElement::addEmbedderCustomElementName("webview");
// TODO(fsamuel): Add <adview> to the whitelist once it has been converted
// into a custom element.
- WebKit::WebCustomElement::allowTagName("browser-plugin");
+ WebKit::WebCustomElement::addEmbedderCustomElementName("browser-plugin");
}
void Dispatcher::AddOrRemoveBindings(const std::string& extension_id) {
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/extensions/document_custom_bindings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698