diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-01 18:16:56 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-01 18:16:56 +0000 |
commit | bfd04a62ce610d7bb61dbb78811dccbed23589b7 (patch) | |
tree | 70bb228c0f00ba1c12c584efd569daccf96b4026 /chrome/browser/task_manager_resource_providers.h | |
parent | a814d863440f0a154a7299f2d8b440f405c7700e (diff) | |
download | chromium_src-bfd04a62ce610d7bb61dbb78811dccbed23589b7.zip chromium_src-bfd04a62ce610d7bb61dbb78811dccbed23589b7.tar.gz chromium_src-bfd04a62ce610d7bb61dbb78811dccbed23589b7.tar.bz2 |
Remove most header file dependencies on the notification type list. It is
really painful to add more types, since lots of headers include the
notification service to derive from the notification observer. This splits that
out, so much less of the project should end up including notification_types.h
---Paths modified but not in any changelist:
Review URL: http://codereview.chromium.org/19744
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_resource_providers.h')
-rw-r--r-- | chrome/browser/task_manager_resource_providers.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/chrome/browser/task_manager_resource_providers.h b/chrome/browser/task_manager_resource_providers.h index bece876..2fb0820 100644 --- a/chrome/browser/task_manager_resource_providers.h +++ b/chrome/browser/task_manager_resource_providers.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_TASK_MANAGER_RESOURCE_PROVIDERS_H__ -#define CHROME_BROWSER_TASK_MANAGER_RESOURCE_PROVIDERS_H__ +#ifndef CHROME_BROWSER_TASK_MANAGER_RESOURCE_PROVIDERS_H_ +#define CHROME_BROWSER_TASK_MANAGER_RESOURCE_PROVIDERS_H_ #include "base/basictypes.h" #include "chrome/browser/plugin_process_info.h" #include "chrome/browser/task_manager.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_observer.h" class PluginProcessHost; class WebContents; @@ -35,7 +35,7 @@ class TaskManagerWebContentsResource : public TaskManager::Resource { HANDLE process_; int pid_; - DISALLOW_EVIL_CONSTRUCTORS(TaskManagerWebContentsResource); + DISALLOW_COPY_AND_ASSIGN(TaskManagerWebContentsResource); }; class TaskManagerWebContentsResourceProvider @@ -72,7 +72,7 @@ class TaskManagerWebContentsResourceProvider // resources. std::map<WebContents*, TaskManagerWebContentsResource*> resources_; - DISALLOW_EVIL_CONSTRUCTORS(TaskManagerWebContentsResourceProvider); + DISALLOW_COPY_AND_ASSIGN(TaskManagerWebContentsResourceProvider); }; class TaskManagerPluginProcessResource : public TaskManager::Resource { @@ -107,7 +107,7 @@ class TaskManagerPluginProcessResource : public TaskManager::Resource { // plugins. static SkBitmap* default_icon_; - DISALLOW_EVIL_CONSTRUCTORS(TaskManagerPluginProcessResource); + DISALLOW_COPY_AND_ASSIGN(TaskManagerPluginProcessResource); }; class TaskManagerPluginProcessResourceProvider @@ -159,7 +159,7 @@ class TaskManagerPluginProcessResourceProvider // byte read notifications). std::map<int, TaskManagerPluginProcessResource*> pid_to_resources_; - DISALLOW_EVIL_CONSTRUCTORS(TaskManagerPluginProcessResourceProvider); + DISALLOW_COPY_AND_ASSIGN(TaskManagerPluginProcessResourceProvider); }; class TaskManagerBrowserProcessResource : public TaskManager::Resource { @@ -191,7 +191,7 @@ class TaskManagerBrowserProcessResource : public TaskManager::Resource { static SkBitmap* default_icon_; - DISALLOW_EVIL_CONSTRUCTORS(TaskManagerBrowserProcessResource); + DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserProcessResource); }; class TaskManagerBrowserProcessResourceProvider @@ -217,8 +217,7 @@ class TaskManagerBrowserProcessResourceProvider TaskManager* task_manager_; TaskManagerBrowserProcessResource resource_; - DISALLOW_EVIL_CONSTRUCTORS(TaskManagerBrowserProcessResourceProvider); + DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserProcessResourceProvider); }; -#endif // CHROME_BROWSER_TASK_MANAGER_RESOURCE_PROVIDERS_H__ - +#endif // CHROME_BROWSER_TASK_MANAGER_RESOURCE_PROVIDERS_H_ |