Index: chrome/browser/task_manager.h |
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h |
index 866246cc8552abad1bf8d9a97aaf2576280a92e9..e6fee61847a01b79a0323638ee8a2be611b3d95d 100644 |
--- a/chrome/browser/task_manager.h |
+++ b/chrome/browser/task_manager.h |
@@ -9,13 +9,18 @@ |
#include <string> |
#include <vector> |
+#include "base/basictypes.h" |
#include "base/lock.h" |
-#include "base/singleton.h" |
+#include "base/process_util.h" |
#include "base/ref_counted.h" |
+#include "base/singleton.h" |
#include "base/timer.h" |
#include "chrome/browser/renderer_host/web_cache_manager.h" |
#include "chrome/browser/tab_contents/tab_contents.h" |
+#if defined(OS_WIN) |
+// TODO(port): Port or produce equivalent. |
#include "chrome/views/controls/table/group_table_view.h" |
+#endif // defined(OS_WIN) |
#include "chrome/views/window/dialog_delegate.h" |
#include "net/url_request/url_request_job_tracker.h" |
#include "testing/gtest/include/gtest/gtest_prod.h" |
@@ -52,7 +57,7 @@ class TaskManager : public views::DialogDelegate { |
virtual std::wstring GetTitle() const = 0; |
virtual SkBitmap GetIcon() const = 0; |
- virtual HANDLE GetProcess() const = 0; |
+ virtual base::ProcessHandle GetProcess() const = 0; |
// A helper function for ActivateFocusedTab. Returns NULL by default |
// because not all resources have an assoiciated tab. |
@@ -142,7 +147,7 @@ class TaskManager : public views::DialogDelegate { |
// Obtain an instance via GetInstance(). |
TaskManager(); |
- friend DefaultSingletonTraits<TaskManager>; |
+ friend struct DefaultSingletonTraits<TaskManager>; |
~TaskManager(); |
@@ -162,6 +167,9 @@ class TaskManager : public views::DialogDelegate { |
DISALLOW_COPY_AND_ASSIGN(TaskManager); |
}; |
+#if defined(OS_WIN) |
+// TODO(port): Port or produce equivalent. |
+ |
// The model that the table is using. |
class TaskManagerTableModel : public views::GroupTableModel, |
public URLRequestJobTracker::JobObserver, |
@@ -323,5 +331,6 @@ class TaskManagerTableModel : public views::GroupTableModel, |
DISALLOW_COPY_AND_ASSIGN(TaskManagerTableModel); |
}; |
+#endif // defined(OS_WIN) |
#endif // CHROME_BROWSER_TASK_MANAGER_H_ |