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

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

Issue 1312653003: Fix for WebView accessible resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fix. Rebased. Created 5 years, 3 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
« no previous file with comments | « extensions/renderer/dispatcher.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/containers/scoped_ptr_map.h" 10 #include "base/containers/scoped_ptr_map.h"
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 IPC_MESSAGE_HANDLER(ExtensionMsg_CancelSuspend, OnCancelSuspend) 810 IPC_MESSAGE_HANDLER(ExtensionMsg_CancelSuspend, OnCancelSuspend)
811 IPC_MESSAGE_HANDLER(ExtensionMsg_DeliverMessage, OnDeliverMessage) 811 IPC_MESSAGE_HANDLER(ExtensionMsg_DeliverMessage, OnDeliverMessage)
812 IPC_MESSAGE_HANDLER(ExtensionMsg_DispatchOnConnect, OnDispatchOnConnect) 812 IPC_MESSAGE_HANDLER(ExtensionMsg_DispatchOnConnect, OnDispatchOnConnect)
813 IPC_MESSAGE_HANDLER(ExtensionMsg_DispatchOnDisconnect, OnDispatchOnDisconnect) 813 IPC_MESSAGE_HANDLER(ExtensionMsg_DispatchOnDisconnect, OnDispatchOnDisconnect)
814 IPC_MESSAGE_HANDLER(ExtensionMsg_Loaded, OnLoaded) 814 IPC_MESSAGE_HANDLER(ExtensionMsg_Loaded, OnLoaded)
815 IPC_MESSAGE_HANDLER(ExtensionMsg_MessageInvoke, OnMessageInvoke) 815 IPC_MESSAGE_HANDLER(ExtensionMsg_MessageInvoke, OnMessageInvoke)
816 IPC_MESSAGE_HANDLER(ExtensionMsg_SetChannel, OnSetChannel) 816 IPC_MESSAGE_HANDLER(ExtensionMsg_SetChannel, OnSetChannel)
817 IPC_MESSAGE_HANDLER(ExtensionMsg_SetScriptingWhitelist, 817 IPC_MESSAGE_HANDLER(ExtensionMsg_SetScriptingWhitelist,
818 OnSetScriptingWhitelist) 818 OnSetScriptingWhitelist)
819 IPC_MESSAGE_HANDLER(ExtensionMsg_SetSystemFont, OnSetSystemFont) 819 IPC_MESSAGE_HANDLER(ExtensionMsg_SetSystemFont, OnSetSystemFont)
820 IPC_MESSAGE_HANDLER(ExtensionMsg_SetWebViewPartitionID,
821 OnSetWebViewPartitionID)
820 IPC_MESSAGE_HANDLER(ExtensionMsg_ShouldSuspend, OnShouldSuspend) 822 IPC_MESSAGE_HANDLER(ExtensionMsg_ShouldSuspend, OnShouldSuspend)
821 IPC_MESSAGE_HANDLER(ExtensionMsg_Suspend, OnSuspend) 823 IPC_MESSAGE_HANDLER(ExtensionMsg_Suspend, OnSuspend)
822 IPC_MESSAGE_HANDLER(ExtensionMsg_TransferBlobs, OnTransferBlobs) 824 IPC_MESSAGE_HANDLER(ExtensionMsg_TransferBlobs, OnTransferBlobs)
823 IPC_MESSAGE_HANDLER(ExtensionMsg_Unloaded, OnUnloaded) 825 IPC_MESSAGE_HANDLER(ExtensionMsg_Unloaded, OnUnloaded)
824 IPC_MESSAGE_HANDLER(ExtensionMsg_UpdatePermissions, OnUpdatePermissions) 826 IPC_MESSAGE_HANDLER(ExtensionMsg_UpdatePermissions, OnUpdatePermissions)
825 IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateTabSpecificPermissions, 827 IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateTabSpecificPermissions,
826 OnUpdateTabSpecificPermissions) 828 OnUpdateTabSpecificPermissions)
827 IPC_MESSAGE_HANDLER(ExtensionMsg_ClearTabSpecificPermissions, 829 IPC_MESSAGE_HANDLER(ExtensionMsg_ClearTabSpecificPermissions,
828 OnClearTabSpecificPermissions) 830 OnClearTabSpecificPermissions)
829 IPC_MESSAGE_HANDLER(ExtensionMsg_UsingWebRequestAPI, OnUsingWebRequestAPI) 831 IPC_MESSAGE_HANDLER(ExtensionMsg_UsingWebRequestAPI, OnUsingWebRequestAPI)
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 const ExtensionsClient::ScriptingWhitelist& extension_ids) { 1049 const ExtensionsClient::ScriptingWhitelist& extension_ids) {
1048 ExtensionsClient::Get()->SetScriptingWhitelist(extension_ids); 1050 ExtensionsClient::Get()->SetScriptingWhitelist(extension_ids);
1049 } 1051 }
1050 1052
1051 void Dispatcher::OnSetSystemFont(const std::string& font_family, 1053 void Dispatcher::OnSetSystemFont(const std::string& font_family,
1052 const std::string& font_size) { 1054 const std::string& font_size) {
1053 system_font_family_ = font_family; 1055 system_font_family_ = font_family;
1054 system_font_size_ = font_size; 1056 system_font_size_ = font_size;
1055 } 1057 }
1056 1058
1059 void Dispatcher::OnSetWebViewPartitionID(const std::string& partition_id) {
1060 // |webview_partition_id_| cannot be changed once set.
1061 CHECK(webview_partition_id_.empty() || webview_partition_id_ == partition_id);
1062 webview_partition_id_ = partition_id;
1063 }
1064
1057 void Dispatcher::OnShouldSuspend(const std::string& extension_id, 1065 void Dispatcher::OnShouldSuspend(const std::string& extension_id,
1058 uint64 sequence_id) { 1066 uint64 sequence_id) {
1059 RenderThread::Get()->Send( 1067 RenderThread::Get()->Send(
1060 new ExtensionHostMsg_ShouldSuspendAck(extension_id, sequence_id)); 1068 new ExtensionHostMsg_ShouldSuspendAck(extension_id, sequence_id));
1061 } 1069 }
1062 1070
1063 void Dispatcher::OnSuspend(const std::string& extension_id) { 1071 void Dispatcher::OnSuspend(const std::string& extension_id) {
1064 // Dispatch the suspend event. This doesn't go through the standard event 1072 // Dispatch the suspend event. This doesn't go through the standard event
1065 // dispatch machinery because it requires special handling. We need to let 1073 // dispatch machinery because it requires special handling. We need to let
1066 // the browser know when we are starting and stopping the event dispatch, so 1074 // the browser know when we are starting and stopping the event dispatch, so
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1569 void Dispatcher::AddChannelSpecificFeatures() { 1577 void Dispatcher::AddChannelSpecificFeatures() {
1570 // chrome-extension: resources should be allowed to register a Service Worker. 1578 // chrome-extension: resources should be allowed to register a Service Worker.
1571 if (FeatureProvider::GetBehaviorFeature(BehaviorFeature::kServiceWorker) 1579 if (FeatureProvider::GetBehaviorFeature(BehaviorFeature::kServiceWorker)
1572 ->IsAvailableToEnvironment() 1580 ->IsAvailableToEnvironment()
1573 .is_available()) 1581 .is_available())
1574 WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers( 1582 WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers(
1575 WebString::fromUTF8(kExtensionScheme)); 1583 WebString::fromUTF8(kExtensionScheme));
1576 } 1584 }
1577 1585
1578 } // namespace extensions 1586 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/renderer/dispatcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698