summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 19:34:12 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 19:34:12 +0000
commita5d1e1e2cf6deb70a8476fd1f970c697274cbca7 (patch)
treef2842a6ea90359429a5c9f46c889a8a943861929 /chrome
parenta4a5740d7ae8c5b54bc4dea0b3ea2deb43edad88 (diff)
downloadchromium_src-a5d1e1e2cf6deb70a8476fd1f970c697274cbca7.zip
chromium_src-a5d1e1e2cf6deb70a8476fd1f970c697274cbca7.tar.gz
chromium_src-a5d1e1e2cf6deb70a8476fd1f970c697274cbca7.tar.bz2
Move task manager code into a subdirectory.
BUG=50548 TEST=compiles Review URL: http://codereview.chromium.org/3454028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser.cc2
-rw-r--r--chrome/browser/cocoa/task_manager_mac.h2
-rw-r--r--chrome/browser/gtk/task_manager_gtk.h2
-rw-r--r--chrome/browser/prefs/browser_prefs.cc2
-rw-r--r--chrome/browser/renderer_host/resource_message_filter.cc2
-rw-r--r--chrome/browser/task_manager/task_manager.cc (renamed from chrome/browser/task_manager.cc)4
-rw-r--r--chrome/browser/task_manager/task_manager.h (renamed from chrome/browser/task_manager.h)6
-rw-r--r--chrome/browser/task_manager/task_manager_browsertest.cc (renamed from chrome/browser/task_manager_browsertest.cc)2
-rw-r--r--chrome/browser/task_manager/task_manager_resource_providers.cc (renamed from chrome/browser/task_manager_resource_providers.cc)2
-rw-r--r--chrome/browser/task_manager/task_manager_resource_providers.h (renamed from chrome/browser/task_manager_resource_providers.h)8
-rw-r--r--chrome/browser/task_manager/task_manager_unittest.cc (renamed from chrome/browser/task_manager_unittest.cc)2
-rw-r--r--chrome/browser/views/task_manager_view.cc2
-rw-r--r--chrome/chrome_browser.gypi8
-rw-r--r--chrome/chrome_tests.gypi4
14 files changed, 24 insertions, 24 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index d774650..d596ec4c 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -112,7 +112,7 @@
#include "chrome/browser/download/save_package.h"
#include "chrome/browser/ssl/ssl_error_info.h"
#include "chrome/browser/shell_integration.h"
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/browser/view_ids.h"
#include "chrome/browser/views/app_launcher.h"
#include "chrome/browser/views/location_bar/location_bar_view.h"
diff --git a/chrome/browser/cocoa/task_manager_mac.h b/chrome/browser/cocoa/task_manager_mac.h
index 675c3ca..0c6feac 100644
--- a/chrome/browser/cocoa/task_manager_mac.h
+++ b/chrome/browser/cocoa/task_manager_mac.h
@@ -12,7 +12,7 @@
#include "base/cocoa_protocols_mac.h"
#include "base/scoped_nsobject.h"
#include "chrome/browser/cocoa/table_row_nsimage_cache.h"
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
@class WindowSizeAutosaver;
class SkBitmap;
diff --git a/chrome/browser/gtk/task_manager_gtk.h b/chrome/browser/gtk/task_manager_gtk.h
index 7f9d5a1..75982e1 100644
--- a/chrome/browser/gtk/task_manager_gtk.h
+++ b/chrome/browser/gtk/task_manager_gtk.h
@@ -12,7 +12,7 @@
#include "app/gtk_signal.h"
#include "base/scoped_ptr.h"
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
#include "grit/generated_resources.h"
#if defined(TOOLKIT_VIEWS)
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index c9e242a..c737a63 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -44,7 +44,7 @@
#include "chrome/browser/sync/signin_manager.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tabs/pinned_tab_codec.h"
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/browser/translate/translate_prefs.h"
#include "chrome/browser/upgrade_detector.h"
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 2ab1aca..4bd8317 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -59,7 +59,7 @@
#include "chrome/browser/search_engines/search_provider_install_state_dispatcher_host.h"
#include "chrome/browser/speech/speech_input_dispatcher_host.h"
#include "chrome/browser/spellchecker_platform_engine.h"
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/browser/ui_thread_helpers.h"
#include "chrome/browser/worker_host/message_port_dispatcher.h"
#include "chrome/browser/worker_host/worker_service.h"
diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 18f9f32..6d4147c 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
@@ -24,7 +24,7 @@
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/resource_dispatcher_host.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/task_manager_resource_providers.h"
+#include "chrome/browser/task_manager/task_manager_resource_providers.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "grit/app_resources.h"
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager/task_manager.h
index c8dd3e6..b7b6890 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager/task_manager.h
@@ -2,8 +2,8 @@
// 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_H_
-#define CHROME_BROWSER_TASK_MANAGER_H_
+#ifndef CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_
+#define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_
#pragma once
#include <map>
@@ -412,4 +412,4 @@ class TaskManagerModel : public URLRequestJobTracker::JobObserver,
DISALLOW_COPY_AND_ASSIGN(TaskManagerModel);
};
-#endif // CHROME_BROWSER_TASK_MANAGER_H_
+#endif // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_
diff --git a/chrome/browser/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 5cb6e3d..bce58f6 100644
--- a/chrome/browser/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
#include "app/l10n_util.h"
#include "base/file_path.h"
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index 1207462..3ba38ce 100644
--- a/chrome/browser/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/task_manager_resource_providers.h"
+#include "chrome/browser/task_manager/task_manager_resource_providers.h"
#include "build/build_config.h"
diff --git a/chrome/browser/task_manager_resource_providers.h b/chrome/browser/task_manager/task_manager_resource_providers.h
index b96083c..d794111 100644
--- a/chrome/browser/task_manager_resource_providers.h
+++ b/chrome/browser/task_manager/task_manager_resource_providers.h
@@ -2,8 +2,8 @@
// 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_TASK_MANAGER_RESOURCE_PROVIDERS_H_
+#define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_RESOURCE_PROVIDERS_H_
#pragma once
#include <map>
@@ -11,7 +11,7 @@
#include "base/basictypes.h"
#include "base/process_util.h"
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/common/child_process_info.h"
#include "chrome/common/notification_observer.h"
#include "chrome/common/notification_registrar.h"
@@ -393,4 +393,4 @@ class TaskManagerBrowserProcessResourceProvider
DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserProcessResourceProvider);
};
-#endif // CHROME_BROWSER_TASK_MANAGER_RESOURCE_PROVIDERS_H_
+#endif // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_RESOURCE_PROVIDERS_H_
diff --git a/chrome/browser/task_manager_unittest.cc b/chrome/browser/task_manager/task_manager_unittest.cc
index f1ca9a0..44d0e31 100644
--- a/chrome/browser/task_manager_unittest.cc
+++ b/chrome/browser/task_manager/task_manager_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
#include <string>
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc
index 9a3e923..452c5d9 100644
--- a/chrome/browser/views/task_manager_view.cc
+++ b/chrome/browser/views/task_manager_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/task_manager.h"
+#include "chrome/browser/task_manager/task_manager.h"
#include "app/l10n_util.h"
#include "app/table_model_observer.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 14b187c..b564fe4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2751,10 +2751,10 @@
'browser/tabs/tab_strip_model_observer.h',
'browser/tabs/tab_strip_model_order_controller.cc',
'browser/tabs/tab_strip_model_order_controller.h',
- 'browser/task_manager.cc',
- 'browser/task_manager.h',
- 'browser/task_manager_resource_providers.cc',
- 'browser/task_manager_resource_providers.h',
+ 'browser/task_manager/task_manager.cc',
+ 'browser/task_manager/task_manager.h',
+ 'browser/task_manager/task_manager_resource_providers.cc',
+ 'browser/task_manager/task_manager_resource_providers.h',
'browser/toolbar_model.cc',
'browser/toolbar_model.h',
'browser/translate/languages_menu_model.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 27054d5..e96c6b4 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1291,7 +1291,7 @@
'browser/tab_menu_model_unittest.cc',
'browser/tabs/pinned_tab_codec_unittest.cc',
'browser/tabs/tab_strip_model_unittest.cc',
- 'browser/task_manager_unittest.cc',
+ 'browser/task_manager/task_manager_unittest.cc',
'browser/translate/translate_manager_unittest.cc',
'browser/user_style_sheet_watcher_unittest.cc',
'browser/views/accessibility_event_router_views_unittest.cc',
@@ -1797,7 +1797,7 @@
'browser/speech/speech_input_browsertest.cc',
'browser/speech/speech_input_bubble_browsertest.cc',
'browser/ssl/ssl_browser_tests.cc',
- 'browser/task_manager_browsertest.cc',
+ 'browser/task_manager/task_manager_browsertest.cc',
'browser/views/browser_actions_container_browsertest.cc',
'browser/views/dom_view_browsertest.cc',
'browser/views/html_dialog_view_browsertest.cc',