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 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1321 blink::WebPlugin* RenderFrameImpl::createPlugin( | 1321 blink::WebPlugin* RenderFrameImpl::createPlugin( |
1322 blink::WebLocalFrame* frame, | 1322 blink::WebLocalFrame* frame, |
1323 const blink::WebPluginParams& params) { | 1323 const blink::WebPluginParams& params) { |
1324 DCHECK_EQ(frame_, frame); | 1324 DCHECK_EQ(frame_, frame); |
1325 blink::WebPlugin* plugin = NULL; | 1325 blink::WebPlugin* plugin = NULL; |
1326 if (GetContentClient()->renderer()->OverrideCreatePlugin( | 1326 if (GetContentClient()->renderer()->OverrideCreatePlugin( |
1327 this, frame, params, &plugin)) { | 1327 this, frame, params, &plugin)) { |
1328 return plugin; | 1328 return plugin; |
1329 } | 1329 } |
1330 | 1330 |
1331 if (base::UTF16ToASCII(params.mimeType) == kBrowserPluginMimeType) { | 1331 if (base::UTF16ToUTF8(params.mimeType) == kBrowserPluginMimeType) { |
1332 return render_view_->GetBrowserPluginManager()->CreateBrowserPlugin( | 1332 return render_view_->GetBrowserPluginManager()->CreateBrowserPlugin( |
1333 render_view_.get(), frame, false); | 1333 render_view_.get(), frame, false); |
1334 } | 1334 } |
1335 | 1335 |
1336 #if defined(ENABLE_PLUGINS) | 1336 #if defined(ENABLE_PLUGINS) |
1337 WebPluginInfo info; | 1337 WebPluginInfo info; |
1338 std::string mime_type; | 1338 std::string mime_type; |
1339 bool found = false; | 1339 bool found = false; |
1340 Send(new FrameHostMsg_GetPluginInfo( | 1340 Send(new FrameHostMsg_GetPluginInfo( |
1341 routing_id_, params.url, frame->top()->document().url(), | 1341 routing_id_, params.url, frame->top()->document().url(), |
(...skipping 2213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3555 | 3555 |
3556 #if defined(ENABLE_BROWSER_CDMS) | 3556 #if defined(ENABLE_BROWSER_CDMS) |
3557 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3557 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
3558 if (!cdm_manager_) | 3558 if (!cdm_manager_) |
3559 cdm_manager_ = new RendererCdmManager(this); | 3559 cdm_manager_ = new RendererCdmManager(this); |
3560 return cdm_manager_; | 3560 return cdm_manager_; |
3561 } | 3561 } |
3562 #endif // defined(ENABLE_BROWSER_CDMS) | 3562 #endif // defined(ENABLE_BROWSER_CDMS) |
3563 | 3563 |
3564 } // namespace content | 3564 } // namespace content |
OLD | NEW |