Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/renderer/extensions/dispatcher.h" | 5 #include "chrome/renderer/extensions/dispatcher.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/debug/alias.h" | 9 #include "base/debug/alias.h" |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 65 #include "chrome/renderer/extensions/safe_builtins.h" | 65 #include "chrome/renderer/extensions/safe_builtins.h" |
| 66 #include "chrome/renderer/extensions/send_request_natives.h" | 66 #include "chrome/renderer/extensions/send_request_natives.h" |
| 67 #include "chrome/renderer/extensions/set_icon_natives.h" | 67 #include "chrome/renderer/extensions/set_icon_natives.h" |
| 68 #include "chrome/renderer/extensions/sync_file_system_custom_bindings.h" | 68 #include "chrome/renderer/extensions/sync_file_system_custom_bindings.h" |
| 69 #include "chrome/renderer/extensions/tab_finder.h" | 69 #include "chrome/renderer/extensions/tab_finder.h" |
| 70 #include "chrome/renderer/extensions/tabs_custom_bindings.h" | 70 #include "chrome/renderer/extensions/tabs_custom_bindings.h" |
| 71 #include "chrome/renderer/extensions/tts_custom_bindings.h" | 71 #include "chrome/renderer/extensions/tts_custom_bindings.h" |
| 72 #include "chrome/renderer/extensions/user_script_slave.h" | 72 #include "chrome/renderer/extensions/user_script_slave.h" |
| 73 #include "chrome/renderer/extensions/web_request_custom_bindings.h" | 73 #include "chrome/renderer/extensions/web_request_custom_bindings.h" |
| 74 #include "chrome/renderer/extensions/webstore_bindings.h" | 74 #include "chrome/renderer/extensions/webstore_bindings.h" |
| 75 #include "chrome/renderer/extensions/webview_custom_bindings.h" | |
| 75 #include "chrome/renderer/resource_bundle_source_map.h" | 76 #include "chrome/renderer/resource_bundle_source_map.h" |
| 76 #include "content/public/renderer/render_thread.h" | 77 #include "content/public/renderer/render_thread.h" |
| 77 #include "content/public/renderer/render_view.h" | 78 #include "content/public/renderer/render_view.h" |
| 78 #include "content/public/renderer/v8_value_converter.h" | 79 #include "content/public/renderer/v8_value_converter.h" |
| 79 #include "extensions/common/constants.h" | 80 #include "extensions/common/constants.h" |
| 80 #include "extensions/common/features/feature_provider.h" | 81 #include "extensions/common/features/feature_provider.h" |
| 81 #include "extensions/common/manifest_constants.h" | 82 #include "extensions/common/manifest_constants.h" |
| 82 #include "extensions/common/view_type.h" | 83 #include "extensions/common/view_type.h" |
| 83 #include "grit/common_resources.h" | 84 #include "grit/common_resources.h" |
| 84 #include "grit/renderer_resources.h" | 85 #include "grit/renderer_resources.h" |
| (...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 884 scoped_ptr<NativeHandler>(new RuntimeCustomBindings(this, context))); | 885 scoped_ptr<NativeHandler>(new RuntimeCustomBindings(this, context))); |
| 885 module_system->RegisterNativeHandler("tabs", | 886 module_system->RegisterNativeHandler("tabs", |
| 886 scoped_ptr<NativeHandler>(new TabsCustomBindings(this, context))); | 887 scoped_ptr<NativeHandler>(new TabsCustomBindings(this, context))); |
| 887 module_system->RegisterNativeHandler("tts", | 888 module_system->RegisterNativeHandler("tts", |
| 888 scoped_ptr<NativeHandler>(new TTSCustomBindings(this, context))); | 889 scoped_ptr<NativeHandler>(new TTSCustomBindings(this, context))); |
| 889 module_system->RegisterNativeHandler("web_request", | 890 module_system->RegisterNativeHandler("web_request", |
| 890 scoped_ptr<NativeHandler>( | 891 scoped_ptr<NativeHandler>( |
| 891 new WebRequestCustomBindings(this, context))); | 892 new WebRequestCustomBindings(this, context))); |
| 892 module_system->RegisterNativeHandler("webstore", | 893 module_system->RegisterNativeHandler("webstore", |
| 893 scoped_ptr<NativeHandler>(new WebstoreBindings(this, context))); | 894 scoped_ptr<NativeHandler>(new WebstoreBindings(this, context))); |
| 895 module_system->RegisterNativeHandler("webview_natives", | |
|
dominicc (has gone to gerrit)
2013/08/17 00:13:12
Assuming subsequent *views, or even something else
Fady Samuel
2013/08/20 23:00:39
Agreed. Moved to document_natives.
| |
| 896 scoped_ptr<NativeHandler>( | |
| 897 new WebviewCustomBindings(this, context))); | |
| 894 } | 898 } |
| 895 | 899 |
| 896 void Dispatcher::PopulateSourceMap() { | 900 void Dispatcher::PopulateSourceMap() { |
| 897 // Libraries. | 901 // Libraries. |
| 898 source_map_.RegisterSource("contentWatcher", IDR_CONTENT_WATCHER_JS); | 902 source_map_.RegisterSource("contentWatcher", IDR_CONTENT_WATCHER_JS); |
| 899 source_map_.RegisterSource("entryIdManager", IDR_ENTRY_ID_MANAGER); | 903 source_map_.RegisterSource("entryIdManager", IDR_ENTRY_ID_MANAGER); |
| 900 source_map_.RegisterSource(kEventModule, IDR_EVENT_BINDINGS_JS); | 904 source_map_.RegisterSource(kEventModule, IDR_EVENT_BINDINGS_JS); |
| 901 source_map_.RegisterSource("imageUtil", IDR_IMAGE_UTIL_JS); | 905 source_map_.RegisterSource("imageUtil", IDR_IMAGE_UTIL_JS); |
| 902 source_map_.RegisterSource("json_schema", IDR_JSON_SCHEMA_JS); | 906 source_map_.RegisterSource("json_schema", IDR_JSON_SCHEMA_JS); |
| 903 source_map_.RegisterSource("lastError", IDR_LAST_ERROR_JS); | 907 source_map_.RegisterSource("lastError", IDR_LAST_ERROR_JS); |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1283 extension->url(), | 1287 extension->url(), |
| 1284 WebString::fromUTF8(schemes[j]), | 1288 WebString::fromUTF8(schemes[j]), |
| 1285 WebString::fromUTF8(i->host()), | 1289 WebString::fromUTF8(i->host()), |
| 1286 i->match_subdomains()); | 1290 i->match_subdomains()); |
| 1287 } | 1291 } |
| 1288 } | 1292 } |
| 1289 } | 1293 } |
| 1290 } | 1294 } |
| 1291 | 1295 |
| 1292 void Dispatcher::EnableCustomElementWhiteList() { | 1296 void Dispatcher::EnableCustomElementWhiteList() { |
| 1293 WebKit::WebRuntimeFeatures::enableCustomElements(true); | 1297 WebKit::WebRuntimeFeatures::enableEmbedderElements(true); |
|
dominicc (has gone to gerrit)
2013/08/17 00:13:12
FYI in response to code review feedback on the Bli
Fady Samuel
2013/08/20 23:00:39
Done.
| |
| 1294 WebKit::WebCustomElement::allowTagName("webview"); | 1298 WebKit::WebCustomElement::addEmbedderElementName("webview"); |
| 1295 // TODO(fsamuel): Add <adview> to the whitelist once it has been converted | 1299 // TODO(fsamuel): Add <adview> to the whitelist once it has been converted |
| 1296 // into a custom element. | 1300 // into a custom element. |
| 1297 WebKit::WebCustomElement::allowTagName("browser-plugin"); | 1301 WebKit::WebCustomElement::addEmbedderElementName("browser-plugin"); |
| 1298 } | 1302 } |
| 1299 | 1303 |
| 1300 void Dispatcher::AddOrRemoveBindings(const std::string& extension_id) { | 1304 void Dispatcher::AddOrRemoveBindings(const std::string& extension_id) { |
| 1301 v8_context_set().ForEach( | 1305 v8_context_set().ForEach( |
| 1302 extension_id, | 1306 extension_id, |
| 1303 NULL, // all render views | 1307 NULL, // all render views |
| 1304 base::Bind(&Dispatcher::AddOrRemoveBindingsForContext, | 1308 base::Bind(&Dispatcher::AddOrRemoveBindingsForContext, |
| 1305 base::Unretained(this))); | 1309 base::Unretained(this))); |
| 1306 } | 1310 } |
| 1307 | 1311 |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1557 RenderView* background_view = | 1561 RenderView* background_view = |
| 1558 ExtensionHelper::GetBackgroundPage(extension_id); | 1562 ExtensionHelper::GetBackgroundPage(extension_id); |
| 1559 if (background_view) { | 1563 if (background_view) { |
| 1560 background_view->Send(new ExtensionHostMsg_EventAck( | 1564 background_view->Send(new ExtensionHostMsg_EventAck( |
| 1561 background_view->GetRoutingID())); | 1565 background_view->GetRoutingID())); |
| 1562 } | 1566 } |
| 1563 } | 1567 } |
| 1564 } | 1568 } |
| 1565 | 1569 |
| 1566 } // namespace extensions | 1570 } // namespace extensions |
| OLD | NEW |