| 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 "content/renderer/browser_plugin/browser_plugin.h" | 5 #include "content/renderer/browser_plugin/browser_plugin.h" |
| 6 | 6 |
| 7 #include "base/json/json_string_value_serializer.h" | 7 #include "base/json/json_string_value_serializer.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 678 bool BrowserPlugin::ShouldGuestBeFocused() const { | 678 bool BrowserPlugin::ShouldGuestBeFocused() const { |
| 679 return plugin_focused_ && embedder_focused_; | 679 return plugin_focused_ && embedder_focused_; |
| 680 } | 680 } |
| 681 | 681 |
| 682 void BrowserPlugin::GuestContentWindowReady(int content_window_routing_id) { | 682 void BrowserPlugin::GuestContentWindowReady(int content_window_routing_id) { |
| 683 DCHECK(content_window_routing_id != MSG_ROUTING_NONE); | 683 DCHECK(content_window_routing_id != MSG_ROUTING_NONE); |
| 684 content_window_routing_id_ = content_window_routing_id; | 684 content_window_routing_id_ = content_window_routing_id; |
| 685 } | 685 } |
| 686 | 686 |
| 687 void BrowserPlugin::SetAcceptTouchEvents(bool accept) { | 687 void BrowserPlugin::SetAcceptTouchEvents(bool accept) { |
| 688 if (container()) | 688 if (container()) { |
| 689 container()->setIsAcceptingTouchEvents(accept); | 689 container()->requestTouchEventType(accept ? |
| 690 WebKit::WebPluginContainer::TouchEventRequestTypeRaw : |
| 691 WebKit::WebPluginContainer::TouchEventRequestTypeNone); |
| 692 } |
| 690 } | 693 } |
| 691 | 694 |
| 692 WebKit::WebPluginContainer* BrowserPlugin::container() const { | 695 WebKit::WebPluginContainer* BrowserPlugin::container() const { |
| 693 return container_; | 696 return container_; |
| 694 } | 697 } |
| 695 | 698 |
| 696 bool BrowserPlugin::initialize(WebPluginContainer* container) { | 699 bool BrowserPlugin::initialize(WebPluginContainer* container) { |
| 697 container_ = container; | 700 container_ = container; |
| 698 return true; | 701 return true; |
| 699 } | 702 } |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 966 void* notify_data) { | 969 void* notify_data) { |
| 967 } | 970 } |
| 968 | 971 |
| 969 void BrowserPlugin::didFailLoadingFrameRequest( | 972 void BrowserPlugin::didFailLoadingFrameRequest( |
| 970 const WebKit::WebURL& url, | 973 const WebKit::WebURL& url, |
| 971 void* notify_data, | 974 void* notify_data, |
| 972 const WebKit::WebURLError& error) { | 975 const WebKit::WebURLError& error) { |
| 973 } | 976 } |
| 974 | 977 |
| 975 } // namespace content | 978 } // namespace content |
| OLD | NEW |