diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 16:10:32 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 16:10:32 +0000 |
| commit | fefe67840b2716b2569946fcfc4a19b55c312e20 (patch) | |
| tree | c0f1ac1d4791e0559cc5020be07b76a92e1e0625 /remoting/client | |
| parent | 46bc6b6b2d6ae156f76a1611362917b49eafc8cb (diff) | |
| download | chromium_src-fefe67840b2716b2569946fcfc4a19b55c312e20.zip chromium_src-fefe67840b2716b2569946fcfc4a19b55c312e20.tar.gz chromium_src-fefe67840b2716b2569946fcfc4a19b55c312e20.tar.bz2 | |
Chromium side changes to use PP_CompletionCallback as the Flush callback.
R=brettw
BUG=47461
TEST=none
Review URL: http://codereview.chromium.org/2852024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/plugin/chromoting_plugin.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/remoting/client/plugin/chromoting_plugin.cc b/remoting/client/plugin/chromoting_plugin.cc index 1657e20..88b19cb 100644 --- a/remoting/client/plugin/chromoting_plugin.cc +++ b/remoting/client/plugin/chromoting_plugin.cc @@ -16,6 +16,7 @@ #include "remoting/jingle_glue/jingle_thread.h" #include "third_party/ppapi/c/pp_event.h" #include "third_party/ppapi/c/pp_rect.h" +#include "third_party/ppapi/cpp/completion_callback.h" #include "third_party/ppapi/cpp/image_data.h" using std::string; @@ -47,7 +48,9 @@ ChromotingPlugin::~ChromotingPlugin() { main_thread_->Stop(); } -bool ChromotingPlugin::Init(uint32_t argc, const char* argn[], const char* argv[]) { +bool ChromotingPlugin::Init(uint32_t argc, + const char* argn[], + const char* argv[]) { LOG(INFO) << "Started ChromotingPlugin::Init"; // Extract the URL from the arguments. @@ -126,7 +129,7 @@ void ChromotingPlugin::ViewChanged(const PP_Rect& position, } } device_context_.ReplaceContents(&image); - device_context_.Flush(NULL, this); + device_context_.Flush(pp::CompletionCallback(NULL, this)); } else { LOG(ERROR) << "Unable to allocate image."; } |