diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 18:27:10 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 18:27:10 +0000 |
| commit | fb3ac0dc2399fe55c40cfc6b6a1d68669176531f (patch) | |
| tree | f608080916e0099b1f37158c79d5badd9c8dbdcc /content/public/renderer | |
| parent | d0fef94d21559d72a47dc44a23d2adf147e79264 (diff) | |
| download | chromium_src-fb3ac0dc2399fe55c40cfc6b6a1d68669176531f.zip chromium_src-fb3ac0dc2399fe55c40cfc6b6a1d68669176531f.tar.gz chromium_src-fb3ac0dc2399fe55c40cfc6b6a1d68669176531f.tar.bz2 | |
Revert 214920 "Pepper: Make PepperPluginInstance::Navigate async."
> Pepper: Make PepperPluginInstance::Navigate async.
>
> The primary motivation for this change is to enable the FileRef refactor; an
> operation that Navigate depends on must be made asychronous. However, this
> change cleans up some weirdness in PepperFlashRendererHost anyway, so I think
> it's worth submitting as is so far. Plus, it makes sure this change is viable
> before I go through modifying the whole call chain.
>
> TBR=joi
> BUG=225441
>
> Review URL: https://chromiumcodereview.appspot.com/21340006
TBR=teravest@chromium.org
Review URL: https://codereview.chromium.org/21794004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/renderer')
| -rw-r--r-- | content/public/renderer/pepper_plugin_instance.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/content/public/renderer/pepper_plugin_instance.h b/content/public/renderer/pepper_plugin_instance.h index 8b48bfa..211752d 100644 --- a/content/public/renderer/pepper_plugin_instance.h +++ b/content/public/renderer/pepper_plugin_instance.h @@ -6,7 +6,6 @@ #define CONTENT_PUBLIC_RENDERER_PEPPER_PLUGIN_INSTANCE_H_ #include "base/basictypes.h" -#include "base/callback_forward.h" #include "base/process/process_handle.h" #include "content/common/content_export.h" #include "ppapi/c/pp_resource.h" @@ -90,10 +89,10 @@ class PepperPluginInstance { virtual bool IsRectTopmost(const gfx::Rect& rect) = 0; - virtual void Navigate(const ppapi::URLRequestInfoData& request, - const char* target, - bool from_user_action, - const base::Callback<void(int32_t)>& callback) = 0; + virtual int32_t Navigate(const ppapi::URLRequestInfoData& request, + const char* target, + bool from_user_action) = 0; + }; } // namespace content |