Index: mojo/examples/html_viewer/webthread_impl.h |
diff --git a/content/child/webthread_impl.h b/mojo/examples/html_viewer/webthread_impl.h |
similarity index 63% |
copy from content/child/webthread_impl.h |
copy to mojo/examples/html_viewer/webthread_impl.h |
index 4c81b2579d6806fc2f2d601682ed2446a095a056..ea068ccba8ac0a0dc31f38e9d8a48697864bde2a 100644 |
--- a/content/child/webthread_impl.h |
+++ b/mojo/examples/html_viewer/webthread_impl.h |
@@ -2,19 +2,19 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_CHILD_WEBTHREAD_IMPL_H_ |
-#define CONTENT_CHILD_WEBTHREAD_IMPL_H_ |
+#ifndef MOJO_EXAMPLES_HTML_VIEWER_WEBTHREAD_IMPL_H_ |
+#define MOJO_EXAMPLES_HTML_VIEWER_WEBTHREAD_IMPL_H_ |
#include <map> |
#include "base/memory/scoped_ptr.h" |
#include "base/threading/thread.h" |
-#include "content/common/content_export.h" |
#include "third_party/WebKit/public/platform/WebThread.h" |
-namespace content { |
+namespace mojo { |
+namespace examples { |
-class CONTENT_EXPORT WebThreadBase : public blink::WebThread { |
+class WebThreadBase : public blink::WebThread { |
public: |
virtual ~WebThreadBase(); |
@@ -33,7 +33,7 @@ class CONTENT_EXPORT WebThreadBase : public blink::WebThread { |
TaskObserverMap task_observer_map_; |
}; |
-class CONTENT_EXPORT WebThreadImpl : public WebThreadBase { |
+class WebThreadImpl : public WebThreadBase { |
public: |
explicit WebThreadImpl(const char* name); |
virtual ~WebThreadImpl(); |
@@ -46,7 +46,7 @@ class CONTENT_EXPORT WebThreadImpl : public WebThreadBase { |
base::MessageLoop* message_loop() const { return thread_->message_loop(); } |
- virtual bool isCurrentThread() const OVERRIDE; |
+ virtual bool isCurrentThread() const; |
private: |
scoped_ptr<base::Thread> thread_; |
@@ -54,21 +54,22 @@ class CONTENT_EXPORT WebThreadImpl : public WebThreadBase { |
class WebThreadImplForMessageLoop : public WebThreadBase { |
public: |
- CONTENT_EXPORT explicit WebThreadImplForMessageLoop( |
+ explicit WebThreadImplForMessageLoop( |
base::MessageLoopProxy* message_loop); |
- CONTENT_EXPORT virtual ~WebThreadImplForMessageLoop(); |
+ virtual ~WebThreadImplForMessageLoop(); |
- virtual void postTask(Task* task) OVERRIDE; |
- virtual void postDelayedTask(Task* task, long long delay_ms) OVERRIDE; |
+ virtual void postTask(Task* task); |
+ virtual void postDelayedTask(Task* task, long long delay_ms); |
- virtual void enterRunLoop() OVERRIDE; |
- virtual void exitRunLoop() OVERRIDE; |
+ virtual void enterRunLoop(); |
+ virtual void exitRunLoop(); |
private: |
- virtual bool isCurrentThread() const OVERRIDE; |
+ virtual bool isCurrentThread() const; |
scoped_refptr<base::MessageLoopProxy> message_loop_; |
}; |
-} // namespace content |
+} // namespace examples |
+} // namespace mojo |
-#endif // CONTENT_CHILD_WEBTHREAD_IMPL_H_ |
+#endif // MOJO_EXAMPLES_HTML_VIEWER_WEBTHREAD_IMPL_H_ |