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

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

Issue 8295023: Move PPB/PPP_MouseLock out of dev/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and resolve conflicts. Created 9 years, 2 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 | « webkit/plugins/ppapi/plugin_module.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 24 matching lines...) Expand all
35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
36 #include "ui/base/ime/text_input_type.h" 36 #include "ui/base/ime/text_input_type.h"
37 #include "ui/gfx/rect.h" 37 #include "ui/gfx/rect.h"
38 #include "webkit/plugins/ppapi/plugin_delegate.h" 38 #include "webkit/plugins/ppapi/plugin_delegate.h"
39 39
40 struct PP_Var; 40 struct PP_Var;
41 struct PPP_Find_Dev; 41 struct PPP_Find_Dev;
42 struct PPP_InputEvent; 42 struct PPP_InputEvent;
43 struct PPP_Instance_Private; 43 struct PPP_Instance_Private;
44 struct PPP_Messaging; 44 struct PPP_Messaging;
45 struct PPP_MouseLock_Dev; 45 struct PPP_MouseLock;
46 struct PPP_Pdf; 46 struct PPP_Pdf;
47 struct PPP_PolicyUpdate_Dev; 47 struct PPP_PolicyUpdate_Dev;
48 struct PPP_Selection_Dev; 48 struct PPP_Selection_Dev;
49 struct PPP_Zoom_Dev; 49 struct PPP_Zoom_Dev;
50 50
51 class SkBitmap; 51 class SkBitmap;
52 class TransportDIB; 52 class TransportDIB;
53 53
54 namespace WebKit { 54 namespace WebKit {
55 class WebInputEvent; 55 class WebInputEvent;
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 // these values are set to true. 501 // these values are set to true.
502 bool has_webkit_focus_; 502 bool has_webkit_focus_;
503 bool has_content_area_focus_; 503 bool has_content_area_focus_;
504 504
505 // The id of the current find operation, or -1 if none is in process. 505 // The id of the current find operation, or -1 if none is in process.
506 int find_identifier_; 506 int find_identifier_;
507 507
508 // The plugin-provided interfaces. 508 // The plugin-provided interfaces.
509 const PPP_Find_Dev* plugin_find_interface_; 509 const PPP_Find_Dev* plugin_find_interface_;
510 const PPP_Messaging* plugin_messaging_interface_; 510 const PPP_Messaging* plugin_messaging_interface_;
511 const PPP_MouseLock_Dev* plugin_mouse_lock_interface_; 511 const PPP_MouseLock* plugin_mouse_lock_interface_;
512 const PPP_InputEvent* plugin_input_event_interface_; 512 const PPP_InputEvent* plugin_input_event_interface_;
513 const PPP_Instance_Private* plugin_private_interface_; 513 const PPP_Instance_Private* plugin_private_interface_;
514 const PPP_Pdf* plugin_pdf_interface_; 514 const PPP_Pdf* plugin_pdf_interface_;
515 const PPP_PolicyUpdate_Dev* plugin_policy_updated_interface_; 515 const PPP_PolicyUpdate_Dev* plugin_policy_updated_interface_;
516 const PPP_Selection_Dev* plugin_selection_interface_; 516 const PPP_Selection_Dev* plugin_selection_interface_;
517 const PPP_Zoom_Dev* plugin_zoom_interface_; 517 const PPP_Zoom_Dev* plugin_zoom_interface_;
518 518
519 // Flags indicating whether we have asked this plugin instance for the 519 // Flags indicating whether we have asked this plugin instance for the
520 // corresponding interfaces, so that we can ask only once. 520 // corresponding interfaces, so that we can ask only once.
521 bool checked_for_plugin_input_event_interface_; 521 bool checked_for_plugin_input_event_interface_;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 613
614 PP_CompletionCallback lock_mouse_callback_; 614 PP_CompletionCallback lock_mouse_callback_;
615 615
616 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 616 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
617 }; 617 };
618 618
619 } // namespace ppapi 619 } // namespace ppapi
620 } // namespace webkit 620 } // namespace webkit
621 621
622 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 622 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698