diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 02:17:08 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 02:17:08 +0000 |
| commit | f214f8797150f49e1233110c1dafe4e8b601d9ea (patch) | |
| tree | 191f4f5b9ee1d9c20fc02dd4f1c940ad4d04267c /chrome/browser/ui | |
| parent | 34b9963c187a733bef76535521f3de688fffd34f (diff) | |
| download | chromium_src-f214f8797150f49e1233110c1dafe4e8b601d9ea.zip chromium_src-f214f8797150f49e1233110c1dafe4e8b601d9ea.tar.gz chromium_src-f214f8797150f49e1233110c1dafe4e8b601d9ea.tar.bz2 | |
Remove base/platform_thread.h stub and fix up all callers to use the new location and namespace.
TEST=none
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index bf6df2a..4b21ec0 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -11,6 +11,7 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/task.h" +#include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" @@ -171,7 +172,7 @@ void TabContentsDragWin::StartBackgroundDragging( const std::string& page_encoding, const SkBitmap& image, const gfx::Point& image_offset) { - drag_drop_thread_id_ = PlatformThread::CurrentId(); + drag_drop_thread_id_ = base::PlatformThread::CurrentId(); DoDragging(drop_data, ops, page_url, page_encoding, image, image_offset); BrowserThread::PostTask( @@ -345,7 +346,7 @@ void TabContentsDragWin::CloseThread() { } void TabContentsDragWin::OnWaitForData() { - DCHECK(drag_drop_thread_id_ == PlatformThread::CurrentId()); + DCHECK(drag_drop_thread_id_ == base::PlatformThread::CurrentId()); // When the left button is release and we start to wait for the data, end // the dragging before DoDragDrop returns. This makes the page leave the drag @@ -356,7 +357,7 @@ void TabContentsDragWin::OnWaitForData() { } void TabContentsDragWin::OnDataObjectDisposed() { - DCHECK(drag_drop_thread_id_ == PlatformThread::CurrentId()); + DCHECK(drag_drop_thread_id_ == base::PlatformThread::CurrentId()); // The drag-and-drop thread is only closed after OLE is done with // DataObjectImpl. diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h index d787931..7e2b7c8 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h @@ -7,9 +7,9 @@ #pragma once #include "app/os_exchange_data_provider_win.h" -#include "base/platform_thread.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "base/threading/platform_thread.h" #include "gfx/point.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" @@ -71,7 +71,7 @@ class TabContentsDragWin void CloseThread(); // For debug check only. Access only on drag-and-drop thread. - PlatformThreadId drag_drop_thread_id_; + base::PlatformThreadId drag_drop_thread_id_; // All the member variables below are accessed on UI thread. |