| 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/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 blink::WebPlugin* RenderFrameImpl::CreatePlugin( | 490 blink::WebPlugin* RenderFrameImpl::CreatePlugin( |
| 491 blink::WebFrame* frame, | 491 blink::WebFrame* frame, |
| 492 const WebPluginInfo& info, | 492 const WebPluginInfo& info, |
| 493 const blink::WebPluginParams& params) { | 493 const blink::WebPluginParams& params) { |
| 494 #if defined(ENABLE_PLUGINS) | 494 #if defined(ENABLE_PLUGINS) |
| 495 bool pepper_plugin_was_registered = false; | 495 bool pepper_plugin_was_registered = false; |
| 496 scoped_refptr<PluginModule> pepper_module(PluginModule::Create( | 496 scoped_refptr<PluginModule> pepper_module(PluginModule::Create( |
| 497 this, info, &pepper_plugin_was_registered)); | 497 this, info, &pepper_plugin_was_registered)); |
| 498 if (pepper_plugin_was_registered) { | 498 if (pepper_plugin_was_registered) { |
| 499 if (pepper_module.get()) { | 499 if (pepper_module.get()) { |
| 500 // TODO(jam): change to take RenderFrame. | 500 return new PepperWebPluginImpl(pepper_module.get(), params, this); |
| 501 return new PepperWebPluginImpl( | |
| 502 pepper_module.get(), params, render_view_->AsWeakPtr(), this); | |
| 503 } | 501 } |
| 504 } | 502 } |
| 505 #if defined(OS_CHROMEOS) | 503 #if defined(OS_CHROMEOS) |
| 506 LOG(WARNING) << "Pepper module/plugin creation failed."; | 504 LOG(WARNING) << "Pepper module/plugin creation failed."; |
| 507 return NULL; | 505 return NULL; |
| 508 #else | 506 #else |
| 509 // TODO(jam): change to take RenderFrame. | 507 // TODO(jam): change to take RenderFrame. |
| 510 return new WebPluginImpl(frame, params, info.path, render_view_->AsWeakPtr(), | 508 return new WebPluginImpl(frame, params, info.path, render_view_->AsWeakPtr(), |
| 511 this); | 509 this); |
| 512 #endif | 510 #endif |
| (...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1375 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { | 1373 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { |
| 1376 observers_.AddObserver(observer); | 1374 observers_.AddObserver(observer); |
| 1377 } | 1375 } |
| 1378 | 1376 |
| 1379 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { | 1377 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { |
| 1380 observer->RenderFrameGone(); | 1378 observer->RenderFrameGone(); |
| 1381 observers_.RemoveObserver(observer); | 1379 observers_.RemoveObserver(observer); |
| 1382 } | 1380 } |
| 1383 | 1381 |
| 1384 } // namespace content | 1382 } // namespace content |
| OLD | NEW |