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/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 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 render_view_->Send(new ViewHostMsg_OpenChannelToPepperPlugin( | 402 render_view_->Send(new ViewHostMsg_OpenChannelToPepperPlugin( |
403 path, &channel_handle, &plugin_child_id)); | 403 path, &channel_handle, &plugin_child_id)); |
404 if (channel_handle.name.empty()) { | 404 if (channel_handle.name.empty()) { |
405 // Couldn't be initialized. | 405 // Couldn't be initialized. |
406 return scoped_refptr<webkit::ppapi::PluginModule>(); | 406 return scoped_refptr<webkit::ppapi::PluginModule>(); |
407 } | 407 } |
408 | 408 |
409 // AddLiveModule must be called before any early returns since the | 409 // AddLiveModule must be called before any early returns since the |
410 // module's destructor will remove itself. | 410 // module's destructor will remove itself. |
411 module = new webkit::ppapi::PluginModule( | 411 module = new webkit::ppapi::PluginModule( |
412 info->name, path, | 412 info->name, info->version, path, |
413 PepperPluginRegistry::GetInstance(), | 413 PepperPluginRegistry::GetInstance(), |
414 permissions); | 414 permissions); |
415 PepperPluginRegistry::GetInstance()->AddLiveModule(path, module); | 415 PepperPluginRegistry::GetInstance()->AddLiveModule(path, module); |
416 | 416 |
417 if (!CreateOutOfProcessModule(module, | 417 if (!CreateOutOfProcessModule(module, |
418 path, | 418 path, |
419 permissions, | 419 permissions, |
420 channel_handle, | 420 channel_handle, |
421 plugin_child_id, | 421 plugin_child_id, |
422 false)) // is_external = false | 422 false)) // is_external = false |
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1735 RenderWidgetFullscreenPepper* container = | 1735 RenderWidgetFullscreenPepper* container = |
1736 static_cast<RenderWidgetFullscreenPepper*>( | 1736 static_cast<RenderWidgetFullscreenPepper*>( |
1737 instance->fullscreen_container()); | 1737 instance->fullscreen_container()); |
1738 return container->mouse_lock_dispatcher(); | 1738 return container->mouse_lock_dispatcher(); |
1739 } else { | 1739 } else { |
1740 return render_view_->mouse_lock_dispatcher(); | 1740 return render_view_->mouse_lock_dispatcher(); |
1741 } | 1741 } |
1742 } | 1742 } |
1743 | 1743 |
1744 } // namespace content | 1744 } // namespace content |
OLD | NEW |