summaryrefslogtreecommitdiffstats
path: root/ppapi/utility
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 21:01:23 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 21:01:23 +0000
commitd4ab94717965952e4ed26def870c4365a294a16c (patch)
treebf7745e42ca0976b75e11b2062492db113aef52f /ppapi/utility
parentf3ccf0c9e03a36c64aa59c0b2daa3affb79d9d35 (diff)
downloadchromium_src-d4ab94717965952e4ed26def870c4365a294a16c.zip
chromium_src-d4ab94717965952e4ed26def870c4365a294a16c.tar.gz
chromium_src-d4ab94717965952e4ed26def870c4365a294a16c.tar.bz2
PPAPI: Take PPB_MessageLoop out of Dev
BUG=92909 Review URL: https://chromiumcodereview.appspot.com/11364188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/utility')
-rw-r--r--ppapi/utility/threading/simple_thread.cc2
-rw-r--r--ppapi/utility/threading/simple_thread.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/utility/threading/simple_thread.cc b/ppapi/utility/threading/simple_thread.cc
index f17c237..783be38 100644
--- a/ppapi/utility/threading/simple_thread.cc
+++ b/ppapi/utility/threading/simple_thread.cc
@@ -13,7 +13,7 @@ namespace pp {
namespace {
struct ThreadData {
- MessageLoop_Dev message_loop;
+ MessageLoop message_loop;
SimpleThread::ThreadFunc func;
void* user_data;
diff --git a/ppapi/utility/threading/simple_thread.h b/ppapi/utility/threading/simple_thread.h
index d60a43d..b3ccd9b 100644
--- a/ppapi/utility/threading/simple_thread.h
+++ b/ppapi/utility/threading/simple_thread.h
@@ -11,8 +11,8 @@
#include <pthread.h>
#endif
-#include "ppapi/cpp/dev/message_loop_dev.h"
#include "ppapi/cpp/instance_handle.h"
+#include "ppapi/cpp/message_loop.h"
namespace pp {
@@ -26,7 +26,7 @@ class SimpleThread {
typedef pthread_t ThreadHandle;
#endif
- typedef void (*ThreadFunc)(MessageLoop_Dev&, void* user_data);
+ typedef void (*ThreadFunc)(MessageLoop&, void* user_data);
explicit SimpleThread(const InstanceHandle& instance);
~SimpleThread();
@@ -46,12 +46,12 @@ class SimpleThread {
// is NULL, this acts the same as Start().
bool StartWithFunction(ThreadFunc func, void* user_data);
- MessageLoop_Dev& message_loop() { return message_loop_; }
+ MessageLoop& message_loop() { return message_loop_; }
ThreadHandle thread() const { return thread_; }
private:
InstanceHandle instance_;
- MessageLoop_Dev message_loop_;
+ MessageLoop message_loop_;
ThreadHandle thread_;