| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 // TODO(bbudge) Webkit will crash if this is a full-frame plug-in and | 438 // TODO(bbudge) Webkit will crash if this is a full-frame plug-in and |
| 439 // we return NULL. Prepare a patch to fix that, and return NULL here. | 439 // we return NULL. Prepare a patch to fix that, and return NULL here. |
| 440 return CreatePluginPlaceholder( | 440 return CreatePluginPlaceholder( |
| 441 render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML, | 441 render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML, |
| 442 IDS_PLUGIN_BLOCKED, false, false); | 442 IDS_PLUGIN_BLOCKED, false, false); |
| 443 } | 443 } |
| 444 } | 444 } |
| 445 | 445 |
| 446 bool pepper_plugin_was_registered = false; | 446 bool pepper_plugin_was_registered = false; |
| 447 scoped_refptr<webkit::ppapi::PluginModule> pepper_module( | 447 scoped_refptr<webkit::ppapi::PluginModule> pepper_module( |
| 448 render_view->pepper_delegate()->CreatePepperPlugin( | 448 render_view->pepper_delegate()->CreatePepperPluginModule( |
| 449 info.path, &pepper_plugin_was_registered)); | 449 info, &pepper_plugin_was_registered)); |
| 450 if (pepper_plugin_was_registered) { | 450 if (pepper_plugin_was_registered) { |
| 451 if (pepper_module) { | 451 if (pepper_module) { |
| 452 return render_view->CreatePepperPlugin( | 452 return render_view->CreatePepperPlugin( |
| 453 frame, params, info.path, pepper_module.get()); | 453 frame, params, info.path, pepper_module.get()); |
| 454 } | 454 } |
| 455 return NULL; | 455 return NULL; |
| 456 } | 456 } |
| 457 | 457 |
| 458 return render_view->CreateNPAPIPlugin( | 458 return render_view->CreateNPAPIPlugin( |
| 459 frame, params, info.path, actual_mime_type); | 459 frame, params, info.path, actual_mime_type); |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 703 if (spellcheck_.get()) | 703 if (spellcheck_.get()) |
| 704 thread->RemoveObserver(spellcheck_.get()); | 704 thread->RemoveObserver(spellcheck_.get()); |
| 705 SpellCheck* new_spellcheck = new SpellCheck(); | 705 SpellCheck* new_spellcheck = new SpellCheck(); |
| 706 if (spellcheck_provider_) | 706 if (spellcheck_provider_) |
| 707 spellcheck_provider_->SetSpellCheck(new_spellcheck); | 707 spellcheck_provider_->SetSpellCheck(new_spellcheck); |
| 708 spellcheck_.reset(new_spellcheck); | 708 spellcheck_.reset(new_spellcheck); |
| 709 thread->AddObserver(new_spellcheck); | 709 thread->AddObserver(new_spellcheck); |
| 710 } | 710 } |
| 711 | 711 |
| 712 } // namespace chrome | 712 } // namespace chrome |
| OLD | NEW |