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

Side by Side Diff: webkit/plugins/ppapi/ppapi_plugin_instance.h

Issue 12568010: Cleanup: Make gamepad API consistent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 9 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
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 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 friend class PpapiUnittest; 479 friend class PpapiUnittest;
480 480
481 // Implements PPB_Gamepad_API. This is just to avoid having an excessive 481 // Implements PPB_Gamepad_API. This is just to avoid having an excessive
482 // number of interfaces implemented by PluginInstance. 482 // number of interfaces implemented by PluginInstance.
483 class GamepadImpl : public ::ppapi::thunk::PPB_Gamepad_API, 483 class GamepadImpl : public ::ppapi::thunk::PPB_Gamepad_API,
484 public ::ppapi::Resource { 484 public ::ppapi::Resource {
485 public: 485 public:
486 explicit GamepadImpl(PluginDelegate* delegate); 486 explicit GamepadImpl(PluginDelegate* delegate);
487 // Resource implementation. 487 // Resource implementation.
488 virtual ::ppapi::thunk::PPB_Gamepad_API* AsPPB_Gamepad_API() OVERRIDE; 488 virtual ::ppapi::thunk::PPB_Gamepad_API* AsPPB_Gamepad_API() OVERRIDE;
489 virtual void Sample(PP_GamepadsSampleData* data) OVERRIDE; 489 virtual void Sample(PP_Instance instance,
490 PP_GamepadsSampleData* data) OVERRIDE;
490 private: 491 private:
491 PluginDelegate* delegate_; 492 PluginDelegate* delegate_;
492 }; 493 };
493 494
494 // See the static Create functions above for creating PluginInstance objects. 495 // See the static Create functions above for creating PluginInstance objects.
495 // This constructor is private so that we can hide the PPP_Instance_Combined 496 // This constructor is private so that we can hide the PPP_Instance_Combined
496 // details while still having 1 constructor to maintain for member 497 // details while still having 1 constructor to maintain for member
497 // initialization. 498 // initialization.
498 PluginInstance(PluginDelegate* delegate, 499 PluginInstance(PluginDelegate* delegate,
499 PluginModule* module, 500 PluginModule* module,
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 scoped_ptr<ContentDecryptorDelegate> content_decryptor_delegate_; 779 scoped_ptr<ContentDecryptorDelegate> content_decryptor_delegate_;
779 780
780 friend class PpapiPluginInstanceTest; 781 friend class PpapiPluginInstanceTest;
781 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 782 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
782 }; 783 };
783 784
784 } // namespace ppapi 785 } // namespace ppapi
785 } // namespace webkit 786 } // namespace webkit
786 787
787 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 788 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698