| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1027 blink::WebPlugin* RenderFrameImpl::createPlugin( | 1027 blink::WebPlugin* RenderFrameImpl::createPlugin( |
| 1028 blink::WebFrame* frame, | 1028 blink::WebFrame* frame, |
| 1029 const blink::WebPluginParams& params) { | 1029 const blink::WebPluginParams& params) { |
| 1030 DCHECK_EQ(frame_, frame); | 1030 DCHECK_EQ(frame_, frame); |
| 1031 blink::WebPlugin* plugin = NULL; | 1031 blink::WebPlugin* plugin = NULL; |
| 1032 if (GetContentClient()->renderer()->OverrideCreatePlugin( | 1032 if (GetContentClient()->renderer()->OverrideCreatePlugin( |
| 1033 this, frame, params, &plugin)) { | 1033 this, frame, params, &plugin)) { |
| 1034 return plugin; | 1034 return plugin; |
| 1035 } | 1035 } |
| 1036 | 1036 |
| 1037 if (UTF16ToASCII(params.mimeType) == kBrowserPluginMimeType) { | 1037 if (base::UTF16ToASCII(params.mimeType) == kBrowserPluginMimeType) { |
| 1038 return render_view_->GetBrowserPluginManager()->CreateBrowserPlugin( | 1038 return render_view_->GetBrowserPluginManager()->CreateBrowserPlugin( |
| 1039 render_view_.get(), frame); | 1039 render_view_.get(), frame); |
| 1040 } | 1040 } |
| 1041 | 1041 |
| 1042 #if defined(ENABLE_PLUGINS) | 1042 #if defined(ENABLE_PLUGINS) |
| 1043 WebPluginInfo info; | 1043 WebPluginInfo info; |
| 1044 std::string mime_type; | 1044 std::string mime_type; |
| 1045 bool found = false; | 1045 bool found = false; |
| 1046 Send(new FrameHostMsg_GetPluginInfo( | 1046 Send(new FrameHostMsg_GetPluginInfo( |
| 1047 routing_id_, params.url, frame->top()->document().url(), | 1047 routing_id_, params.url, frame->top()->document().url(), |
| (...skipping 1703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2751 } | 2751 } |
| 2752 | 2752 |
| 2753 Send(new FrameHostMsg_OpenURL(routing_id_, params)); | 2753 Send(new FrameHostMsg_OpenURL(routing_id_, params)); |
| 2754 } | 2754 } |
| 2755 | 2755 |
| 2756 void RenderFrameImpl::didChangeLoadProgress(double load_progress) { | 2756 void RenderFrameImpl::didChangeLoadProgress(double load_progress) { |
| 2757 render_view_->didChangeLoadProgress(frame_, load_progress); | 2757 render_view_->didChangeLoadProgress(frame_, load_progress); |
| 2758 } | 2758 } |
| 2759 | 2759 |
| 2760 } // namespace content | 2760 } // namespace content |
| OLD | NEW |