diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-30 08:59:39 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-30 08:59:39 +0000 |
| commit | 5d438dbad8819250385df8c0c67ff26a8586db90 (patch) | |
| tree | e92c79a19a64264e7c0bede469eaa6d91af120af /chrome/browser/task_manager.h | |
| parent | 264e3cd23191c41de8310c60d981be159f65038a (diff) | |
| download | chromium_src-5d438dbad8819250385df8c0c67ff26a8586db90.zip chromium_src-5d438dbad8819250385df8c0c67ff26a8586db90.tar.gz chromium_src-5d438dbad8819250385df8c0c67ff26a8586db90.tar.bz2 | |
Make task_manager_resource_providers.cc compile on POSIX.
TEST=Make sure that the task manager isn't obviously broken on Windows.
Review URL: http://codereview.chromium.org/93067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager.h')
| -rw-r--r-- | chrome/browser/task_manager.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h index 106aeaa..da4f0d2 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. @@ -144,7 +149,7 @@ class TaskManager : public views::DialogDelegate { // Obtain an instance via GetInstance(). TaskManager(); - friend DefaultSingletonTraits<TaskManager>; + friend struct DefaultSingletonTraits<TaskManager>; ~TaskManager(); @@ -164,6 +169,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, @@ -325,5 +333,6 @@ class TaskManagerTableModel : public views::GroupTableModel, DISALLOW_COPY_AND_ASSIGN(TaskManagerTableModel); }; +#endif // defined(OS_WIN) #endif // CHROME_BROWSER_TASK_MANAGER_H_ |