Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3925)

Unified Diff: chrome_frame/chrome_frame_automation.h

Issue 6001010: Move platform_thread to base/threading and put in the base namespace. I left ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/cfproxy_private.h ('k') | chrome_frame/chrome_frame_automation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_frame_automation.h
===================================================================
--- chrome_frame/chrome_frame_automation.h (revision 70328)
+++ chrome_frame/chrome_frame_automation.h (working copy)
@@ -16,8 +16,8 @@
#include "base/scoped_handle.h"
#include "base/stack_container.h"
#include "base/task.h"
+#include "base/thread.h"
#include "base/timer.h"
-#include "base/thread.h"
#include "chrome/common/page_zoom.h"
#include "chrome/test/automation/automation_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
@@ -251,12 +251,12 @@
return thread_->message_loop();
}
- bool IsSameThread(PlatformThreadId id) const {
+ bool IsSameThread(base::PlatformThreadId id) const {
return thread_->thread_id() == id;
}
ChromeFrameAutomationProxyImpl* proxy() const {
- DCHECK(IsSameThread(PlatformThread::CurrentId()));
+ DCHECK(IsSameThread(base::PlatformThread::CurrentId()));
return proxy_.get();
}
@@ -509,7 +509,7 @@
}
HWND parent_window_;
- PlatformThreadId ui_thread_id_;
+ base::PlatformThreadId ui_thread_id_;
void* automation_server_id_;
ChromeFrameAutomationProxy* automation_server_;
« no previous file with comments | « chrome_frame/cfproxy_private.h ('k') | chrome_frame/chrome_frame_automation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698