Create task_manager namespace and wrap classes related to TaskManager with it.

chrome/browser/task_manager/task_manager.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/task_manager/task_manager.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/task_manager/task_manager_background_resource_provider.h"
-#include "chrome/browser/task_manager/task_manager_browser_process_resource_provider.h"
-#include "chrome/browser/task_manager/task_manager_child_process_resource_provider.h"
-#include "chrome/browser/task_manager/task_manager_extension_process_resource_provider.h"
-#include "chrome/browser/task_manager/task_manager_guest_resource_provider.h"
-#include "chrome/browser/task_manager/task_manager_notification_resource_provider.h"
-#include "chrome/browser/task_manager/task_manager_panel_resource_provider.h"
-#include "chrome/browser/task_manager/task_manager_tab_contents_resource_provider.h"
-#include "chrome/browser/task_manager/task_manager_worker_resource_provider.h"
+#include "chrome/browser/task_manager/background_resource_provider.h"
+#include "chrome/browser/task_manager/browser_process_resource_provider.h"
+#include "chrome/browser/task_manager/child_process_resource_provider.h"
+#include "chrome/browser/task_manager/extension_process_resource_provider.h"
+#include "chrome/browser/task_manager/guest_resource_provider.h"
+#include "chrome/browser/task_manager/notification_resource_provider.h"
+#include "chrome/browser/task_manager/panel_resource_provider.h"
+#include "chrome/browser/task_manager/tab_contents_resource_provider.h"
+#include "chrome/browser/task_manager/worker_resource_provider.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/icu/public/i18n/unicode/coll.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/image/image_skia.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/task_manager/task_manager_os_resources_win.h"
-#endif
-
 using content::BrowserThread;
 using content::OpenURLParams;
 using content::Referrer;
 using content::ResourceRequestInfo;
 using content::WebContents;
 
 namespace {
 
 // The delay between updates of the information (in ms).
 #if defined(OS_MACOSX)
@@ skipping 141 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
     : pending_video_memory_usage_stats_update_(false),
       update_requests_(0),
       listen_requests_(0),
       update_state_(IDLE),
       goat_salt_(base::RandUint64()),
       last_unique_id_(0) {
   AddResourceProvider(
-      new TaskManagerBrowserProcessResourceProvider(task_manager));
+      new task_manager::BrowserProcessResourceProvider(task_manager));
   AddResourceProvider(
-      new TaskManagerBackgroundContentsResourceProvider(task_manager));
-  AddResourceProvider(new TaskManagerTabContentsResourceProvider(task_manager));
-  AddResourceProvider(new TaskManagerPanelResourceProvider(task_manager));
+      new task_manager::BackgroundContentsResourceProvider(task_manager));
   AddResourceProvider(
-      new TaskManagerChildProcessResourceProvider(task_manager));
+      new task_manager::TabContentsResourceProvider(task_manager));
+  AddResourceProvider(new task_manager::PanelResourceProvider(task_manager));
   AddResourceProvider(
-      new TaskManagerExtensionProcessResourceProvider(task_manager));
+      new task_manager::ChildProcessResourceProvider(task_manager));
   AddResourceProvider(
-      new TaskManagerGuestResourceProvider(task_manager));
+      new task_manager::ExtensionProcessResourceProvider(task_manager));
+  AddResourceProvider(new task_manager::GuestResourceProvider(task_manager));
 
 #if defined(ENABLE_NOTIFICATIONS)
   TaskManager::ResourceProvider* provider =
-      TaskManagerNotificationResourceProvider::Create(task_manager);
+      task_manager::NotificationResourceProvider::Create(task_manager);
   if (provider)
     AddResourceProvider(provider);
 #endif
 
-  AddResourceProvider(new TaskManagerWorkerResourceProvider(task_manager));
+  AddResourceProvider(new task_manager::WorkerResourceProvider(task_manager));
 }
 
 void TaskManagerModel::AddObserver(TaskManagerModelObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void TaskManagerModel::RemoveObserver(TaskManagerModelObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
@@ skipping 287 matching lines @@
     // Memory = working_set.private + working_set.shareable.
     // We exclude the shared memory.
     values.is_physical_memory_valid = true;
     values.physical_memory = iter->second->GetWorkingSetSize();
     values.physical_memory -= ws_usage.shared * 1024;
   }
   *result = values.physical_memory;
   return true;
 }
 
+#if defined(OS_WIN)
+namespace {

[yoshiki, 2013/05/20 04:50:02]

Utility methods should be placed at the top. We already have an anonymous
namespace at the top of the file. Please move these methods there.

[peria, 2013/05/20 05:39:04]

Done.

+void GetWinGDIHandles(base::ProcessHandle process,
+                      size_t* current,
+                      size_t* peak) {
+  *current = 0;
+  *peak = 0;
+  // Get a handle to |process| that has PROCESS_QUERY_INFORMATION rights.
+  HANDLE current_process = GetCurrentProcess();
+  HANDLE process_with_query_rights;
+  if (DuplicateHandle(current_process, process, current_process,
+                      &process_with_query_rights, PROCESS_QUERY_INFORMATION,
+                      false, 0)) {
+    *current = GetGuiResources(process_with_query_rights, GR_GDIOBJECTS);
+    *peak = GetGuiResources(process_with_query_rights, GR_GDIOBJECTS_PEAK);
+    CloseHandle(process_with_query_rights);
+  }
+}
+
+void GetWinUSERHandles(base::ProcessHandle process,

[yoshiki, 2013/05/20 04:50:02]

ditto

[peria, 2013/05/20 05:39:04]

Done.

+                       size_t* current,
+                       size_t* peak) {
+  *current = 0;
+  *peak = 0;
+  // Get a handle to |process| that has PROCESS_QUERY_INFORMATION rights.
+  HANDLE current_process = GetCurrentProcess();
+  HANDLE process_with_query_rights;
+  if (DuplicateHandle(current_process, process, current_process,
+                      &process_with_query_rights, PROCESS_QUERY_INFORMATION,
+                      false, 0)) {
+    *current = GetGuiResources(process_with_query_rights, GR_USEROBJECTS);
+    *peak = GetGuiResources(process_with_query_rights, GR_USEROBJECTS_PEAK);
+    CloseHandle(process_with_query_rights);
+  }
+}
+}  // namespace
+#endif
+
 void TaskManagerModel::GetGDIHandles(int index,
                                      size_t* current,
                                      size_t* peak) const {
   *current = 0;
   *peak = 0;
 #if defined(OS_WIN)
   base::ProcessHandle handle = GetResource(index)->GetProcess();
   PerProcessValues& values(per_process_cache_[handle]);
 
   if (!values.is_gdi_handles_valid) {
@@ skipping 1027 matching lines @@
   }
   return count;
 }
 
 TaskManager::TaskManager()
     : model_(new TaskManagerModel(this)) {
 }
 
 TaskManager::~TaskManager() {
 }