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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 = PluginChannelHost::GetPluginChannelHost( | 324 channel_host = PluginChannelHost::GetPluginChannelHost( |
325 channel_handle, ChildProcess::current()->io_task_runner(), | 325 channel_handle, ChildProcess::current()->io_task_runner()); |
326 RenderThreadImpl::current()->GetAttachmentBroker()); | |
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 893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1230 | 1229 |
1231 plugin_->URLRedirectResponse(allow, resource_id); | 1230 plugin_->URLRedirectResponse(allow, resource_id); |
1232 } | 1231 } |
1233 | 1232 |
1234 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url, | 1233 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url, |
1235 bool* result) { | 1234 bool* result) { |
1236 *result = plugin_->CheckIfRunInsecureContent(url); | 1235 *result = plugin_->CheckIfRunInsecureContent(url); |
1237 } | 1236 } |
1238 | 1237 |
1239 } // namespace content | 1238 } // namespace content |
OLD | NEW |