summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 19:05:54 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 19:05:54 +0000
commit7e090a60318e68dd14d4ac652704645da76154ca (patch)
tree37913cee12bfd62f801687d494b4aa11a27de003 /chrome/browser
parent27e0ab93e38c8253e91b6e2b5f7a11a28cd31d82 (diff)
downloadchromium_src-7e090a60318e68dd14d4ac652704645da76154ca.zip
chromium_src-7e090a60318e68dd14d4ac652704645da76154ca.tar.gz
chromium_src-7e090a60318e68dd14d4ac652704645da76154ca.tar.bz2
Fix build break.
TBR=dimich BUG=none TEST=none Review URL: http://codereview.chromium.org/550060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/tab_contents/tab_contents_drag_win.cc8
-rw-r--r--chrome/browser/views/tab_contents/tab_contents_drag_win.h2
2 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc
index a507c6c..013dd40 100644
--- a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc
@@ -89,12 +89,10 @@ class DragDropThread : public base::Thread {
};
TabContentsDragWin::TabContentsDragWin(TabContentsViewWin* view)
- : view_(view),
+ : drag_drop_thread_id_(0),
+ view_(view),
drag_ended_(false),
old_drop_target_suspended_state_(false) {
-#ifndef NDEBUG
- drag_drop_thread_id_ = 0;
-#endif
}
TabContentsDragWin::~TabContentsDragWin() {
@@ -160,9 +158,7 @@ void TabContentsDragWin::StartBackgroundDragging(
WebDragOperationsMask ops,
const GURL& page_url,
const std::string& page_encoding) {
-#ifndef NDEBUG
drag_drop_thread_id_ = PlatformThread::CurrentId();
-#endif
DoDragging(drop_data, ops, page_url, page_encoding);
ChromeThread::PostTask(
diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.h b/chrome/browser/views/tab_contents/tab_contents_drag_win.h
index 5fbddd9..36f7068 100644
--- a/chrome/browser/views/tab_contents/tab_contents_drag_win.h
+++ b/chrome/browser/views/tab_contents/tab_contents_drag_win.h
@@ -62,9 +62,7 @@ class TabContentsDragWin
void CloseThread();
// For debug check only. Access only on drag-and-drop thread.
-#ifndef NDEBUG
PlatformThreadId drag_drop_thread_id_;
-#endif
// All the member variables below are accessed on UI thread.