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

Side by Side Diff: extensions/renderer/dispatcher.cc

Issue 972313002: Make <webview> use out-of-process iframe architecture. (Closed) Base URL: ssh://saopaulo.wat/mnt/dev/shared/src@testoopif2z-better-chrome
Patch Set: address all comments from Nasko and Charlie, minus is_loading Created 5 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/renderer/dispatcher.h" 5 #include "extensions/renderer/dispatcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/alias.h" 10 #include "base/debug/alias.h"
(...skipping 12 matching lines...) Expand all
23 #include "content/public/renderer/render_thread.h" 23 #include "content/public/renderer/render_thread.h"
24 #include "content/public/renderer/render_view.h" 24 #include "content/public/renderer/render_view.h"
25 #include "extensions/common/api/messaging/message.h" 25 #include "extensions/common/api/messaging/message.h"
26 #include "extensions/common/constants.h" 26 #include "extensions/common/constants.h"
27 #include "extensions/common/extension_api.h" 27 #include "extensions/common/extension_api.h"
28 #include "extensions/common/extension_messages.h" 28 #include "extensions/common/extension_messages.h"
29 #include "extensions/common/extension_urls.h" 29 #include "extensions/common/extension_urls.h"
30 #include "extensions/common/feature_switch.h" 30 #include "extensions/common/feature_switch.h"
31 #include "extensions/common/features/feature.h" 31 #include "extensions/common/features/feature.h"
32 #include "extensions/common/features/feature_provider.h" 32 #include "extensions/common/features/feature_provider.h"
33 #include "extensions/common/guest_view/extensions_guest_view_messages.h"
33 #include "extensions/common/manifest.h" 34 #include "extensions/common/manifest.h"
34 #include "extensions/common/manifest_constants.h" 35 #include "extensions/common/manifest_constants.h"
35 #include "extensions/common/manifest_handlers/background_info.h" 36 #include "extensions/common/manifest_handlers/background_info.h"
36 #include "extensions/common/manifest_handlers/content_capabilities_handler.h" 37 #include "extensions/common/manifest_handlers/content_capabilities_handler.h"
37 #include "extensions/common/manifest_handlers/externally_connectable.h" 38 #include "extensions/common/manifest_handlers/externally_connectable.h"
38 #include "extensions/common/manifest_handlers/options_page_info.h" 39 #include "extensions/common/manifest_handlers/options_page_info.h"
39 #include "extensions/common/message_bundle.h" 40 #include "extensions/common/message_bundle.h"
40 #include "extensions/common/permissions/permission_set.h" 41 #include "extensions/common/permissions/permission_set.h"
41 #include "extensions/common/permissions/permissions_data.h" 42 #include "extensions/common/permissions/permissions_data.h"
42 #include "extensions/common/switches.h" 43 #include "extensions/common/switches.h"
43 #include "extensions/common/view_type.h" 44 #include "extensions/common/view_type.h"
44 #include "extensions/renderer/api_activity_logger.h" 45 #include "extensions/renderer/api_activity_logger.h"
45 #include "extensions/renderer/api_definitions_natives.h" 46 #include "extensions/renderer/api_definitions_natives.h"
46 #include "extensions/renderer/app_runtime_custom_bindings.h" 47 #include "extensions/renderer/app_runtime_custom_bindings.h"
47 #include "extensions/renderer/app_window_custom_bindings.h" 48 #include "extensions/renderer/app_window_custom_bindings.h"
48 #include "extensions/renderer/binding_generating_native_handler.h" 49 #include "extensions/renderer/binding_generating_native_handler.h"
49 #include "extensions/renderer/blob_native_handler.h" 50 #include "extensions/renderer/blob_native_handler.h"
50 #include "extensions/renderer/content_watcher.h" 51 #include "extensions/renderer/content_watcher.h"
51 #include "extensions/renderer/context_menus_custom_bindings.h" 52 #include "extensions/renderer/context_menus_custom_bindings.h"
52 #include "extensions/renderer/css_native_handler.h" 53 #include "extensions/renderer/css_native_handler.h"
53 #include "extensions/renderer/dispatcher_delegate.h" 54 #include "extensions/renderer/dispatcher_delegate.h"
54 #include "extensions/renderer/document_custom_bindings.h" 55 #include "extensions/renderer/document_custom_bindings.h"
55 #include "extensions/renderer/dom_activity_logger.h" 56 #include "extensions/renderer/dom_activity_logger.h"
56 #include "extensions/renderer/event_bindings.h" 57 #include "extensions/renderer/event_bindings.h"
57 #include "extensions/renderer/extension_helper.h" 58 #include "extensions/renderer/extension_helper.h"
58 #include "extensions/renderer/extensions_renderer_client.h" 59 #include "extensions/renderer/extensions_renderer_client.h"
59 #include "extensions/renderer/file_system_natives.h" 60 #include "extensions/renderer/file_system_natives.h"
61 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
60 #include "extensions/renderer/guest_view/guest_view_internal_custom_bindings.h" 62 #include "extensions/renderer/guest_view/guest_view_internal_custom_bindings.h"
61 #include "extensions/renderer/i18n_custom_bindings.h" 63 #include "extensions/renderer/i18n_custom_bindings.h"
62 #include "extensions/renderer/id_generator_custom_bindings.h" 64 #include "extensions/renderer/id_generator_custom_bindings.h"
63 #include "extensions/renderer/lazy_background_page_native_handler.h" 65 #include "extensions/renderer/lazy_background_page_native_handler.h"
64 #include "extensions/renderer/logging_native_handler.h" 66 #include "extensions/renderer/logging_native_handler.h"
65 #include "extensions/renderer/messaging_bindings.h" 67 #include "extensions/renderer/messaging_bindings.h"
66 #include "extensions/renderer/module_system.h" 68 #include "extensions/renderer/module_system.h"
67 #include "extensions/renderer/print_native_handler.h" 69 #include "extensions/renderer/print_native_handler.h"
68 #include "extensions/renderer/process_info_native_handler.h" 70 #include "extensions/renderer/process_info_native_handler.h"
69 #include "extensions/renderer/render_view_observer_natives.h" 71 #include "extensions/renderer/render_view_observer_natives.h"
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 IPC_MESSAGE_HANDLER(ExtensionMsg_ShouldSuspend, OnShouldSuspend) 704 IPC_MESSAGE_HANDLER(ExtensionMsg_ShouldSuspend, OnShouldSuspend)
703 IPC_MESSAGE_HANDLER(ExtensionMsg_Suspend, OnSuspend) 705 IPC_MESSAGE_HANDLER(ExtensionMsg_Suspend, OnSuspend)
704 IPC_MESSAGE_HANDLER(ExtensionMsg_TransferBlobs, OnTransferBlobs) 706 IPC_MESSAGE_HANDLER(ExtensionMsg_TransferBlobs, OnTransferBlobs)
705 IPC_MESSAGE_HANDLER(ExtensionMsg_Unloaded, OnUnloaded) 707 IPC_MESSAGE_HANDLER(ExtensionMsg_Unloaded, OnUnloaded)
706 IPC_MESSAGE_HANDLER(ExtensionMsg_UpdatePermissions, OnUpdatePermissions) 708 IPC_MESSAGE_HANDLER(ExtensionMsg_UpdatePermissions, OnUpdatePermissions)
707 IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateTabSpecificPermissions, 709 IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateTabSpecificPermissions,
708 OnUpdateTabSpecificPermissions) 710 OnUpdateTabSpecificPermissions)
709 IPC_MESSAGE_HANDLER(ExtensionMsg_ClearTabSpecificPermissions, 711 IPC_MESSAGE_HANDLER(ExtensionMsg_ClearTabSpecificPermissions,
710 OnClearTabSpecificPermissions) 712 OnClearTabSpecificPermissions)
711 IPC_MESSAGE_HANDLER(ExtensionMsg_UsingWebRequestAPI, OnUsingWebRequestAPI) 713 IPC_MESSAGE_HANDLER(ExtensionMsg_UsingWebRequestAPI, OnUsingWebRequestAPI)
714 IPC_MESSAGE_HANDLER_GENERIC(ExtensionsGuestViewMsg_GuestReady,
715 OnGuestReady(message))
712 IPC_MESSAGE_FORWARD(ExtensionMsg_WatchPages, 716 IPC_MESSAGE_FORWARD(ExtensionMsg_WatchPages,
713 content_watcher_.get(), 717 content_watcher_.get(),
714 ContentWatcher::OnWatchPages) 718 ContentWatcher::OnWatchPages)
715 IPC_MESSAGE_UNHANDLED(handled = false) 719 IPC_MESSAGE_UNHANDLED(handled = false)
716 IPC_END_MESSAGE_MAP() 720 IPC_END_MESSAGE_MAP()
717 721
718 return handled; 722 return handled;
719 } 723 }
720 724
721 void Dispatcher::WebKitInitialized() { 725 void Dispatcher::WebKitInitialized() {
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 extension->permissions_data()->GetEffectiveHostPermissions()); 1030 extension->permissions_data()->GetEffectiveHostPermissions());
1027 } 1031 }
1028 } 1032 }
1029 } 1033 }
1030 } 1034 }
1031 1035
1032 void Dispatcher::OnUsingWebRequestAPI(bool webrequest_used) { 1036 void Dispatcher::OnUsingWebRequestAPI(bool webrequest_used) {
1033 webrequest_used_ = webrequest_used; 1037 webrequest_used_ = webrequest_used;
1034 } 1038 }
1035 1039
1040 // We do not have a BrowserPluginManager to route this message, so we
1041 // handle the message here.
1042 // TODO(lazyboy): dispatcher.cc is too generic to handle this message, find
1043 // a better way to route the message.
1044 void Dispatcher::OnGuestReady(const IPC::Message& message) {
1045 ExtensionsGuestViewMsg_GuestReady::Param param;
1046 bool read_status = ExtensionsGuestViewMsg_GuestReady::Read(&message, &param);
1047 DCHECK(read_status);
1048 int element_instance_id = get<0>(param);
1049 auto container = static_cast<ExtensionsGuestViewContainer*>(
1050 GuestViewContainer::FromID(element_instance_id));
1051 DCHECK(container);
1052 container->OnMessage(message);
1053 }
1054
1036 void Dispatcher::OnUserScriptsUpdated(const std::set<HostID>& changed_hosts, 1055 void Dispatcher::OnUserScriptsUpdated(const std::set<HostID>& changed_hosts,
1037 const std::vector<UserScript*>& scripts) { 1056 const std::vector<UserScript*>& scripts) {
1038 UpdateActiveExtensions(); 1057 UpdateActiveExtensions();
1039 } 1058 }
1040 1059
1041 void Dispatcher::UpdateActiveExtensions() { 1060 void Dispatcher::UpdateActiveExtensions() {
1042 std::set<std::string> active_extensions = active_extension_ids_; 1061 std::set<std::string> active_extensions = active_extension_ids_;
1043 user_script_set_manager_->GetAllActiveExtensionIds(&active_extensions); 1062 user_script_set_manager_->GetAllActiveExtensionIds(&active_extensions);
1044 delegate_->OnActiveExtensionsUpdated(active_extensions); 1063 delegate_->OnActiveExtensionsUpdated(active_extensions);
1045 } 1064 }
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
1410 // The "guestViewDeny" module must always be loaded last. It registers 1429 // The "guestViewDeny" module must always be loaded last. It registers
1411 // error-providing custom elements for the GuestView types that are not 1430 // error-providing custom elements for the GuestView types that are not
1412 // available, and thus all of those types must have been checked and loaded 1431 // available, and thus all of those types must have been checked and loaded
1413 // (or not loaded) beforehand. 1432 // (or not loaded) beforehand.
1414 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1433 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1415 module_system->Require("guestViewDeny"); 1434 module_system->Require("guestViewDeny");
1416 } 1435 }
1417 } 1436 }
1418 1437
1419 } // namespace extensions 1438 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698