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/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
713 } | 713 } |
714 | 714 |
715 bool ChromeContentRendererClient::ShouldPumpEventsDuringCookieMessage() { | 715 bool ChromeContentRendererClient::ShouldPumpEventsDuringCookieMessage() { |
716 // We no longer pump messages, even under Chrome Frame. We rely on cookie | 716 // We no longer pump messages, even under Chrome Frame. We rely on cookie |
717 // read requests handled by CF not putting up UI or causing other actions | 717 // read requests handled by CF not putting up UI or causing other actions |
718 // that would require us to pump messages. This fixes http://crbug.com/110090. | 718 // that would require us to pump messages. This fixes http://crbug.com/110090. |
719 return false; | 719 return false; |
720 } | 720 } |
721 | 721 |
722 void ChromeContentRendererClient::DidCreateScriptContext( | 722 void ChromeContentRendererClient::DidCreateScriptContext( |
723 WebFrame* frame, v8::Handle<v8::Context> context, int world_id) { | 723 WebFrame* frame, v8::Handle<v8::Context> context, int extension_group, |
724 extension_dispatcher_->DidCreateScriptContext(frame, context, world_id); | 724 int world_id) { |
| 725 extension_dispatcher_->DidCreateScriptContext(frame, context, extension_group, |
| 726 world_id); |
725 } | 727 } |
726 | 728 |
727 void ChromeContentRendererClient::WillReleaseScriptContext( | 729 void ChromeContentRendererClient::WillReleaseScriptContext( |
728 WebFrame* frame, v8::Handle<v8::Context> context, int world_id) { | 730 WebFrame* frame, v8::Handle<v8::Context> context, int world_id) { |
729 extension_dispatcher_->WillReleaseScriptContext(frame, context, world_id); | 731 extension_dispatcher_->WillReleaseScriptContext(frame, context, world_id); |
730 } | 732 } |
731 | 733 |
732 unsigned long long ChromeContentRendererClient::VisitedLinkHash( | 734 unsigned long long ChromeContentRendererClient::VisitedLinkHash( |
733 const char* canonical_url, size_t length) { | 735 const char* canonical_url, size_t length) { |
734 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); | 736 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
856 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { | 858 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { |
857 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); | 859 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); |
858 } | 860 } |
859 | 861 |
860 bool ChromeContentRendererClient::AllowSocketAPI(const GURL& url) { | 862 bool ChromeContentRendererClient::AllowSocketAPI(const GURL& url) { |
861 return allowed_socket_origins_.find(url.host()) != | 863 return allowed_socket_origins_.find(url.host()) != |
862 allowed_socket_origins_.end(); | 864 allowed_socket_origins_.end(); |
863 } | 865 } |
864 | 866 |
865 } // namespace chrome | 867 } // namespace chrome |
OLD | NEW |