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 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
471 bool pepper_plugin_was_registered = false; | 471 bool pepper_plugin_was_registered = false; |
472 scoped_refptr<PluginModule> pepper_module(PluginModule::Create( | 472 scoped_refptr<PluginModule> pepper_module(PluginModule::Create( |
473 this, info, &pepper_plugin_was_registered)); | 473 this, info, &pepper_plugin_was_registered)); |
474 if (pepper_plugin_was_registered) { | 474 if (pepper_plugin_was_registered) { |
475 if (pepper_module.get()) { | 475 if (pepper_module.get()) { |
476 // TODO(jam): change to take RenderFrame. | 476 // TODO(jam): change to take RenderFrame. |
477 return new PepperWebPluginImpl( | 477 return new PepperWebPluginImpl( |
478 pepper_module.get(), params, render_view_->AsWeakPtr(), this); | 478 pepper_module.get(), params, render_view_->AsWeakPtr(), this); |
479 } | 479 } |
480 } | 480 } |
481 | 481 #if defined(OS_CHROMEOS) |
| 482 LOG(WARNING) << "Pepper module/plugin creation failed."; |
| 483 return NULL; |
| 484 #else |
482 // TODO(jam): change to take RenderFrame. | 485 // TODO(jam): change to take RenderFrame. |
483 return new WebPluginImpl(frame, params, info.path, render_view_->AsWeakPtr(), | 486 return new WebPluginImpl(frame, params, info.path, render_view_->AsWeakPtr(), |
484 this); | 487 this); |
| 488 #endif |
485 #else | 489 #else |
486 return NULL; | 490 return NULL; |
487 #endif | 491 #endif |
488 } | 492 } |
489 | 493 |
490 // blink::WebFrameClient implementation ---------------------------------------- | 494 // blink::WebFrameClient implementation ---------------------------------------- |
491 | 495 |
492 blink::WebPlugin* RenderFrameImpl::createPlugin( | 496 blink::WebPlugin* RenderFrameImpl::createPlugin( |
493 blink::WebFrame* frame, | 497 blink::WebFrame* frame, |
494 const blink::WebPluginParams& params) { | 498 const blink::WebPluginParams& params) { |
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1334 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { | 1338 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { |
1335 observers_.AddObserver(observer); | 1339 observers_.AddObserver(observer); |
1336 } | 1340 } |
1337 | 1341 |
1338 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { | 1342 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { |
1339 observer->RenderFrameGone(); | 1343 observer->RenderFrameGone(); |
1340 observers_.RemoveObserver(observer); | 1344 observers_.RemoveObserver(observer); |
1341 } | 1345 } |
1342 | 1346 |
1343 } // namespace content | 1347 } // namespace content |
OLD | NEW |