| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/npapi/webplugin_delegate_proxy.h" | 5 #include "content/renderer/npapi/webplugin_delegate_proxy.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 LOG(ERROR) << "Plugin crashed on start"; | 314 LOG(ERROR) << "Plugin crashed on start"; |
| 315 | 315 |
| 316 // Return true so that the plugin widget is created and we can paint the | 316 // Return true so that the plugin widget is created and we can paint the |
| 317 // crashed plugin there. | 317 // crashed plugin there. |
| 318 return true; | 318 return true; |
| 319 } | 319 } |
| 320 LOG(ERROR) << "Plugin couldn't be found"; | 320 LOG(ERROR) << "Plugin couldn't be found"; |
| 321 return false; | 321 return false; |
| 322 } | 322 } |
| 323 | 323 |
| 324 channel_host = | 324 channel_host = PluginChannelHost::GetPluginChannelHost( |
| 325 PluginChannelHost::GetPluginChannelHost( | 325 channel_handle, ChildProcess::current()->io_task_runner()); |
| 326 channel_handle, ChildProcess::current()->io_message_loop_proxy()); | |
| 327 if (!channel_host.get()) { | 326 if (!channel_host.get()) { |
| 328 LOG(ERROR) << "Couldn't get PluginChannelHost"; | 327 LOG(ERROR) << "Couldn't get PluginChannelHost"; |
| 329 continue; | 328 continue; |
| 330 } | 329 } |
| 331 #if defined(OS_MACOSX) | 330 #if defined(OS_MACOSX) |
| 332 track_nested_removes.reset(); | 331 track_nested_removes.reset(); |
| 333 #endif | 332 #endif |
| 334 | 333 |
| 335 { | 334 { |
| 336 // TODO(bauerb): Debugging for http://crbug.com/141055. | 335 // TODO(bauerb): Debugging for http://crbug.com/141055. |
| (...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1236 | 1235 |
| 1237 plugin_->URLRedirectResponse(allow, resource_id); | 1236 plugin_->URLRedirectResponse(allow, resource_id); |
| 1238 } | 1237 } |
| 1239 | 1238 |
| 1240 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url, | 1239 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url, |
| 1241 bool* result) { | 1240 bool* result) { |
| 1242 *result = plugin_->CheckIfRunInsecureContent(url); | 1241 *result = plugin_->CheckIfRunInsecureContent(url); |
| 1243 } | 1242 } |
| 1244 | 1243 |
| 1245 } // namespace content | 1244 } // namespace content |
| OLD | NEW |