summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 22:50:33 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 22:50:33 +0000
commitae5ff9ae378480a54511e007541b62b5d9ea94bf (patch)
treeed127f19d1125bb9f94b8b54e03fa32fbac634b1 /remoting
parentafc72b46447cc5a5fe181552318fc7bd76d1ffa6 (diff)
downloadchromium_src-ae5ff9ae378480a54511e007541b62b5d9ea94bf.zip
chromium_src-ae5ff9ae378480a54511e007541b62b5d9ea94bf.tar.gz
chromium_src-ae5ff9ae378480a54511e007541b62b5d9ea94bf.tar.bz2
Move paint aggregator and the completion callback factory.
[Reland of 116281] Move paint aggregator and the completion callback factory to the ppapi/helpers directory since they're not strictly wrappers. Review URL: http://codereview.chromium.org/9030001 Review URL: http://codereview.chromium.org/9122012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/protocol/DEPS1
-rw-r--r--remoting/protocol/pepper_transport_socket_adapter.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/remoting/protocol/DEPS b/remoting/protocol/DEPS
index 5da27db..c982f42 100644
--- a/remoting/protocol/DEPS
+++ b/remoting/protocol/DEPS
@@ -4,6 +4,7 @@ include_rules = [
"+net",
"+ppapi/c",
"+ppapi/cpp",
+ "+ppapi/utility",
"+remoting/jingle_glue",
"+third_party/protobuf/src",
]
diff --git a/remoting/protocol/pepper_transport_socket_adapter.h b/remoting/protocol/pepper_transport_socket_adapter.h
index bd84bb8..5888268 100644
--- a/remoting/protocol/pepper_transport_socket_adapter.h
+++ b/remoting/protocol/pepper_transport_socket_adapter.h
@@ -14,7 +14,7 @@
#include "net/base/net_log.h"
#include "net/socket/stream_socket.h"
#include "ppapi/c/pp_stdint.h"
-#include "ppapi/cpp/completion_callback.h"
+#include "ppapi/utility/completion_callback_factory.h"
namespace pp {
class Transport_Dev;