diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:02:16 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:02:16 +0000 |
commit | ce072a7181ea5d58133e33654133236f5d9f5551 (patch) | |
tree | 1b1c903fec3fd27038cd17cb4ae9ca17d3736e40 /chrome_frame/chrome_frame_automation.h | |
parent | a8e2058011129cbef38bf89834ee01715556b392 (diff) | |
download | chromium_src-ce072a7181ea5d58133e33654133236f5d9f5551.zip chromium_src-ce072a7181ea5d58133e33654133236f5d9f5551.tar.gz chromium_src-ce072a7181ea5d58133e33654133236f5d9f5551.tar.bz2 |
Move platform_thread to base/threading and put in the base namespace. I left a
stub and "using" declarations in the old location to avoid having to change the
entire project at once.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6001010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.h')
-rw-r--r-- | chrome_frame/chrome_frame_automation.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index 5b7ec85..73d4f1d 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -16,8 +16,8 @@ #include "base/scoped_handle.h" #include "base/stack_container.h" #include "base/task.h" -#include "base/timer.h" #include "base/thread.h" +#include "base/timer.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 @@ class AutomationProxyCacheEntry 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 @@ class ChromeFrameAutomationClient } HWND parent_window_; - PlatformThreadId ui_thread_id_; + base::PlatformThreadId ui_thread_id_; void* automation_server_id_; ChromeFrameAutomationProxy* automation_server_; |