Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1868)

Side by Side Diff: content/renderer/pepper/pepper_plugin_delegate_impl.cc

Issue 10414068: Browser Plugin: Fix broken build windows build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Right merge Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/pepper/pepper_plugin_delegate_impl.h" 5 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <cstddef> 8 #include <cstddef>
9 #include <map> 9 #include <map>
10 #include <queue> 10 #include <queue>
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 PepperPluginDelegateImpl::CreateBrowserPluginModule( 271 PepperPluginDelegateImpl::CreateBrowserPluginModule(
272 const IPC::ChannelHandle& channel_handle, 272 const IPC::ChannelHandle& channel_handle,
273 int guest_process_id) { 273 int guest_process_id) {
274 BrowserPluginRegistry* registry = 274 BrowserPluginRegistry* registry =
275 RenderThreadImpl::current()->browser_plugin_registry(); 275 RenderThreadImpl::current()->browser_plugin_registry();
276 scoped_refptr<webkit::ppapi::PluginModule> module = 276 scoped_refptr<webkit::ppapi::PluginModule> module =
277 registry->GetModule(guest_process_id); 277 registry->GetModule(guest_process_id);
278 if (module) 278 if (module)
279 return module; 279 return module;
280 280
281 FilePath path(kBrowserPluginPath);
281 scoped_refptr<PepperHungPluginFilter> hung_filter( 282 scoped_refptr<PepperHungPluginFilter> hung_filter(
282 new PepperHungPluginFilter(FilePath(kBrowserPluginPath), 283 new PepperHungPluginFilter(path,
283 render_view_->routing_id(), 284 render_view_->routing_id(),
284 guest_process_id)); 285 guest_process_id));
285 // Create a new HostDispatcher for the proxying, and hook it to a new 286 // Create a new HostDispatcher for the proxying, and hook it to a new
286 // PluginModule. 287 // PluginModule.
287 module = new webkit::ppapi::PluginModule(kBrowserPluginName, 288 module = new webkit::ppapi::PluginModule(kBrowserPluginName,
288 FilePath(kBrowserPluginPath), 289 path,
289 registry); 290 registry);
290 RenderThreadImpl::current()->browser_plugin_registry()->AddModule( 291 RenderThreadImpl::current()->browser_plugin_registry()->AddModule(
291 guest_process_id, module); 292 guest_process_id, module);
292 scoped_ptr<HostDispatcherWrapper> dispatcher(new HostDispatcherWrapper); 293 scoped_ptr<HostDispatcherWrapper> dispatcher(new HostDispatcherWrapper);
293 if (!dispatcher->Init( 294 if (!dispatcher->Init(
294 channel_handle, 295 channel_handle,
295 module->pp_module(), 296 module->pp_module(),
296 webkit::ppapi::PluginModule::GetLocalGetInterfaceFunc(), 297 webkit::ppapi::PluginModule::GetLocalGetInterfaceFunc(),
297 GetPreferences(), 298 GetPreferences(),
298 hung_filter.get())) 299 hung_filter.get()))
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1680 mouse_lock_instances_.erase(it); 1681 mouse_lock_instances_.erase(it);
1681 } 1682 }
1682 } 1683 }
1683 1684
1684 webkit_glue::ClipboardClient* 1685 webkit_glue::ClipboardClient*
1685 PepperPluginDelegateImpl::CreateClipboardClient() const { 1686 PepperPluginDelegateImpl::CreateClipboardClient() const {
1686 return new RendererClipboardClient; 1687 return new RendererClipboardClient;
1687 } 1688 }
1688 1689
1689 } // namespace content 1690 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698