diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 18:05:41 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 18:05:41 +0000 |
| commit | c62dd9d42bd87964a131adc688d0c70f63cc4cac (patch) | |
| tree | b57f3bc0843d2acace088498ecb40e0bfc213b6c /chrome_frame | |
| parent | b6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9 (diff) | |
| download | chromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.zip chromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.tar.gz chromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.tar.bz2 | |
Delete Tracked, and move Location to its own file.
The Birth/Death tracking of tasks has been moved out-of-band into MessageLoop's PendingTask structure.
Thus, Task no longer needs to inherit from Tracked. Since Task was the only child of Tracked, delete the Tracked class and move Location to its own file.
BUG=none
TEST=builds
Review URL: http://codereview.chromium.org/7879006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_delegate.h | 2 | ||||
| -rw-r--r-- | chrome_frame/external_tab.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/external_tab_test.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/task_marshaller.cc | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h index 582365b..d2e9921 100644 --- a/chrome_frame/chrome_frame_delegate.h +++ b/chrome_frame/chrome_frame_delegate.h @@ -13,6 +13,7 @@ #include <vector> #include "base/file_path.h" +#include "base/location.h" #include "base/synchronization/lock.h" #include "base/task.h" #include "chrome/common/automation_constants.h" @@ -139,7 +140,6 @@ template <class T> class TaskMarshallerThroughWindowsMessages TaskMarshallerThroughWindowsMessages() {} virtual void PostTask(const tracked_objects::Location& from_here, Task* task) { - task->SetBirthPlace(from_here); T* this_ptr = static_cast<T*>(this); if (this_ptr->IsWindow()) { this_ptr->AddRef(); diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc index 6be47a7..38e74aa 100644 --- a/chrome_frame/external_tab.cc +++ b/chrome_frame/external_tab.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome_frame/external_tab.h" #include "base/lazy_instance.h" -#include "base/tracked.h" +#include "base/location.h" +#include "chrome_frame/external_tab.h" #include "base/task.h" #include "base/synchronization/waitable_event.h" #include "chrome/common/automation_messages.h" diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc index 63834a0..9a30508 100644 --- a/chrome_frame/external_tab_test.cc +++ b/chrome_frame/external_tab_test.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome_frame/external_tab.h" +#include "base/location.h" #include "base/task.h" #include "base/threading/thread.h" -#include "base/tracked.h" +#include "chrome_frame/external_tab.h" // #include "base/synchronization/waitable_event.h" diff --git a/chrome_frame/task_marshaller.cc b/chrome_frame/task_marshaller.cc index 4b257a6..f597262 100644 --- a/chrome_frame/task_marshaller.cc +++ b/chrome_frame/task_marshaller.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -17,7 +17,6 @@ TaskMarshallerThroughMessageQueue::~TaskMarshallerThroughMessageQueue() { void TaskMarshallerThroughMessageQueue::PostTask( const tracked_objects::Location& from_here, Task* task) { DCHECK(wnd_ != NULL); - task->SetBirthPlace(from_here); lock_.Acquire(); bool has_work = !pending_tasks_.empty(); pending_tasks_.push(task); |