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

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

Issue 19800005: Hide knowledge of webkit::ppapi::PluginDelegate from chrome. This is part of moving ppapi implement… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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
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_PLUGIN_MODULE_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
6 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 14 matching lines...) Expand all
25 #include "ppapi/shared_impl/ppapi_permissions.h" 25 #include "ppapi/shared_impl/ppapi_permissions.h"
26 #include "webkit/plugins/ppapi/plugin_delegate.h" 26 #include "webkit/plugins/ppapi/plugin_delegate.h"
27 #include "webkit/plugins/webkit_plugins_export.h" 27 #include "webkit/plugins/webkit_plugins_export.h"
28 28
29 typedef void* NPIdentifier; 29 typedef void* NPIdentifier;
30 30
31 namespace base { 31 namespace base {
32 class FilePath; 32 class FilePath;
33 } 33 }
34 34
35 namespace content {
36 class RenderView;
37 }
38
35 namespace ppapi { 39 namespace ppapi {
36 class CallbackTracker; 40 class CallbackTracker;
37 class WebKitForwarding; 41 class WebKitForwarding;
38 } // namespace ppapi 42 } // namespace ppapi
39 43
40 namespace WebKit { 44 namespace WebKit {
41 class WebPluginContainer; 45 class WebPluginContainer;
42 } // namespace WebKit 46 } // namespace WebKit
43 47
44 namespace webkit { 48 namespace webkit {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 155
152 // Returns the module handle. This may be used before Init() is called (the 156 // Returns the module handle. This may be used before Init() is called (the
153 // proxy needs this information to set itself up properly). 157 // proxy needs this information to set itself up properly).
154 PP_Module pp_module() const { return pp_module_; } 158 PP_Module pp_module() const { return pp_module_; }
155 159
156 const std::string& name() const { return name_; } 160 const std::string& name() const { return name_; }
157 const base::FilePath& path() const { return path_; } 161 const base::FilePath& path() const { return path_; }
158 const ::ppapi::PpapiPermissions& permissions() const { return permissions_; } 162 const ::ppapi::PpapiPermissions& permissions() const { return permissions_; }
159 163
160 PluginInstance* CreateInstance(PluginDelegate* delegate, 164 PluginInstance* CreateInstance(PluginDelegate* delegate,
165 content::RenderView* render_view,
161 WebKit::WebPluginContainer* container, 166 WebKit::WebPluginContainer* container,
162 const GURL& plugin_url); 167 const GURL& plugin_url);
163 168
164 // Returns "some" plugin instance associated with this module. This is not 169 // Returns "some" plugin instance associated with this module. This is not
165 // guaranteed to be any one in particular. This is normally used to execute 170 // guaranteed to be any one in particular. This is normally used to execute
166 // callbacks up to the browser layer that are not inherently per-instance, 171 // callbacks up to the browser layer that are not inherently per-instance,
167 // but the delegate lives only on the plugin instance so we need one of them. 172 // but the delegate lives only on the plugin instance so we need one of them.
168 PluginInstance* GetSomeInstance() const; 173 PluginInstance* GetSomeInstance() const;
169 174
170 const PluginInstanceSet& GetAllInstances() const { return instances_; } 175 const PluginInstanceSet& GetAllInstances() const { return instances_; }
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 272
268 PP_Bool (*reserve_instance_id_)(PP_Module, PP_Instance); 273 PP_Bool (*reserve_instance_id_)(PP_Module, PP_Instance);
269 274
270 DISALLOW_COPY_AND_ASSIGN(PluginModule); 275 DISALLOW_COPY_AND_ASSIGN(PluginModule);
271 }; 276 };
272 277
273 } // namespace ppapi 278 } // namespace ppapi
274 } // namespace webkit 279 } // namespace webkit
275 280
276 #endif // WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_ 281 #endif // WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698