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 6745021: Rename PPB_Flash::NavigateToURL() (to Navigate()) and make it take an URLRequestInfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: doh Created 9 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 | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/ppb_flash_proxy.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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 class FullscreenContainer; 57 class FullscreenContainer;
58 class MessageChannel; 58 class MessageChannel;
59 class ObjectVar; 59 class ObjectVar;
60 class PluginDelegate; 60 class PluginDelegate;
61 class PluginModule; 61 class PluginModule;
62 class PluginObject; 62 class PluginObject;
63 class PPB_Graphics2D_Impl; 63 class PPB_Graphics2D_Impl;
64 class PPB_ImageData_Impl; 64 class PPB_ImageData_Impl;
65 class PPB_Surface3D_Impl; 65 class PPB_Surface3D_Impl;
66 class PPB_URLLoader_Impl; 66 class PPB_URLLoader_Impl;
67 class PPB_URLRequestInfo_Impl;
67 class Resource; 68 class Resource;
68 69
69 // Represents one time a plugin appears on one web page. 70 // Represents one time a plugin appears on one web page.
70 // 71 //
71 // Note: to get from a PP_Instance to a PluginInstance*, use the 72 // Note: to get from a PP_Instance to a PluginInstance*, use the
72 // ResourceTracker. 73 // ResourceTracker.
73 class PluginInstance : public base::RefCounted<PluginInstance> { 74 class PluginInstance : public base::RefCounted<PluginInstance> {
74 public: 75 public:
75 PluginInstance(PluginDelegate* delegate, 76 PluginInstance(PluginDelegate* delegate,
76 PluginModule* module, 77 PluginModule* module,
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 bool IsFullscreen(); 211 bool IsFullscreen();
211 bool IsFullscreenOrPending(); 212 bool IsFullscreenOrPending();
212 213
213 // Switches between fullscreen and normal mode. If |delay_report| is set to 214 // Switches between fullscreen and normal mode. If |delay_report| is set to
214 // false, it may report the new state through DidChangeView immediately. If 215 // false, it may report the new state through DidChangeView immediately. If
215 // true, it will delay it. When called from the plugin, delay_report should be 216 // true, it will delay it. When called from the plugin, delay_report should be
216 // true to avoid re-entrancy. 217 // true to avoid re-entrancy.
217 void SetFullscreen(bool fullscreen, bool delay_report); 218 void SetFullscreen(bool fullscreen, bool delay_report);
218 219
219 // Implementation of PPB_Flash. 220 // Implementation of PPB_Flash.
220 bool NavigateToURL(const char* url, const char* target); 221 int32_t Navigate(PPB_URLRequestInfo_Impl* request,
222 const char* target,
223 bool from_user_action);
221 224
222 // Implementation of PPB_Messaging and PPP_Messaging. 225 // Implementation of PPB_Messaging and PPP_Messaging.
223 void PostMessage(PP_Var message); 226 void PostMessage(PP_Var message);
224 void HandleMessage(PP_Var message); 227 void HandleMessage(PP_Var message);
225 228
226 PluginDelegate::PlatformContext3D* CreateContext3D(); 229 PluginDelegate::PlatformContext3D* CreateContext3D();
227 230
228 // Tracks all live ObjectVar. This is so we can map between PluginModule + 231 // Tracks all live ObjectVar. This is so we can map between PluginModule +
229 // NPObject and get the ObjectVar corresponding to it. This Add/Remove 232 // NPObject and get the ObjectVar corresponding to it. This Add/Remove
230 // function should be called by the ObjectVar when it is created and 233 // function should be called by the ObjectVar when it is created and
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 typedef std::map<NPObject*, ObjectVar*> NPObjectToObjectVarMap; 400 typedef std::map<NPObject*, ObjectVar*> NPObjectToObjectVarMap;
398 NPObjectToObjectVarMap np_object_to_object_var_; 401 NPObjectToObjectVarMap np_object_to_object_var_;
399 402
400 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 403 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
401 }; 404 };
402 405
403 } // namespace ppapi 406 } // namespace ppapi
404 } // namespace webkit 407 } // namespace webkit
405 408
406 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 409 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/ppb_flash_proxy.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698