summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 21:51:56 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 21:51:56 +0000
commitbe3c1e93ec6381e99a867262a1108e6df0c8285b (patch)
tree64e04e3f991141019a39e2676d9b9947c0e0ebfb /chrome/browser/task_manager
parentdc849cc62a3b3ad1b0cc246e88dc4d204a9774cc (diff)
downloadchromium_src-be3c1e93ec6381e99a867262a1108e6df0c8285b.zip
chromium_src-be3c1e93ec6381e99a867262a1108e6df0c8285b.tar.gz
chromium_src-be3c1e93ec6381e99a867262a1108e6df0c8285b.tar.bz2
Remove wstring from the task manager.
BUG=23581 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6410065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
-rw-r--r--chrome/browser/task_manager/task_manager.cc8
-rw-r--r--chrome/browser/task_manager/task_manager.h2
-rw-r--r--chrome/browser/task_manager/task_manager_resource_providers.cc50
-rw-r--r--chrome/browser/task_manager/task_manager_resource_providers.h112
-rw-r--r--chrome/browser/task_manager/task_manager_unittest.cc6
5 files changed, 89 insertions, 89 deletions
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 879ecd5a..4c3634f 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -122,7 +122,7 @@ void TaskManagerModel::RemoveObserver(TaskManagerModelObserver* observer) {
string16 TaskManagerModel::GetResourceTitle(int index) const {
CHECK_LT(index, ResourceCount());
- return WideToUTF16Hack(resources_[index]->GetTitle());
+ return resources_[index]->GetTitle();
}
int64 TaskManagerModel::GetNetworkUsage(int index) const {
@@ -149,13 +149,13 @@ double TaskManagerModel::GetCPUUsage(int index) const {
string16 TaskManagerModel::GetResourceCPUUsage(int index) const {
CHECK_LT(index, ResourceCount());
- return WideToUTF16Hack(StringPrintf(
+ return UTF8ToUTF16(StringPrintf(
#if defined(OS_MACOSX)
// Activity Monitor shows %cpu with one decimal digit -- be
// consistent with that.
- L"%.1f",
+ "%.1f",
#else
- L"%.0f",
+ "%.0f",
#endif
GetCPUUsage(resources_[index])));
}
diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h
index 2b2cbea..d71106b 100644
--- a/chrome/browser/task_manager/task_manager.h
+++ b/chrome/browser/task_manager/task_manager.h
@@ -57,7 +57,7 @@ class TaskManager {
GPU // A graphics process.
};
- virtual std::wstring GetTitle() const = 0;
+ virtual string16 GetTitle() const = 0;
virtual SkBitmap GetIcon() const = 0;
virtual base::ProcessHandle GetProcess() const = 0;
virtual Type GetType() const = 0;
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index 0a82236..6bc429f 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -169,7 +169,7 @@ TaskManager::Resource::Type TaskManagerTabContentsResource::GetType() const {
return tab_contents_->HostsExtension() ? EXTENSION : RENDERER;
}
-std::wstring TaskManagerTabContentsResource::GetTitle() const {
+string16 TaskManagerTabContentsResource::GetTitle() const {
// Fall back on the URL if there's no title.
string16 tab_title = tab_contents_->GetTitle();
if (tab_title.empty()) {
@@ -195,7 +195,7 @@ std::wstring TaskManagerTabContentsResource::GetTitle() const {
extensions_service->IsInstalledApp(tab_contents_->GetURL()),
tab_contents_->HostsExtension(),
tab_contents_->profile()->IsOffTheRecord());
- return UTF16ToWideHack(l10n_util::GetStringFUTF16(message_id, tab_title));
+ return l10n_util::GetStringFUTF16(message_id, tab_title);
}
SkBitmap TaskManagerTabContentsResource::GetIcon() const {
@@ -392,7 +392,7 @@ SkBitmap* TaskManagerBackgroundContentsResource::default_icon_ = NULL;
TaskManagerBackgroundContentsResource::TaskManagerBackgroundContentsResource(
BackgroundContents* background_contents,
- const std::wstring& application_name)
+ const string16& application_name)
: TaskManagerRendererResource(
background_contents->render_view_host()->process()->GetHandle(),
background_contents->render_view_host()),
@@ -413,8 +413,8 @@ TaskManagerBackgroundContentsResource::~TaskManagerBackgroundContentsResource(
) {
}
-std::wstring TaskManagerBackgroundContentsResource::GetTitle() const {
- string16 title = WideToUTF16Hack(application_name_);
+string16 TaskManagerBackgroundContentsResource::GetTitle() const {
+ string16 title = application_name_;
if (title.empty()) {
// No title (can't locate the parent app for some reason) so just display
@@ -422,8 +422,7 @@ std::wstring TaskManagerBackgroundContentsResource::GetTitle() const {
title = base::i18n::GetDisplayStringInLTRDirectionality(
UTF8ToUTF16(background_contents_->GetURL().spec()));
}
- return UTF16ToWideHack(
- l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_BACKGROUND_PREFIX, title));
+ return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_BACKGROUND_PREFIX, title);
}
@@ -495,7 +494,7 @@ void TaskManagerBackgroundContentsResourceProvider::StartUpdating() {
background_contents_service->GetBackgroundContents();
for (std::vector<BackgroundContents*>::iterator iterator = contents.begin();
iterator != contents.end(); ++iterator) {
- std::wstring application_name;
+ string16 application_name;
// Lookup the name from the parent extension.
if (extensions_service) {
const string16& application_id =
@@ -503,7 +502,7 @@ void TaskManagerBackgroundContentsResourceProvider::StartUpdating() {
const Extension* extension = extensions_service->GetExtensionById(
UTF16ToUTF8(application_id), false);
if (extension)
- application_name = UTF8ToWide(extension->name());
+ application_name = UTF8ToUTF16(extension->name());
}
Add(*iterator, application_name);
}
@@ -538,7 +537,7 @@ void TaskManagerBackgroundContentsResourceProvider::StopUpdating() {
void TaskManagerBackgroundContentsResourceProvider::AddToTaskManager(
BackgroundContents* background_contents,
- const std::wstring& application_name) {
+ const string16& application_name) {
TaskManagerBackgroundContentsResource* resource =
new TaskManagerBackgroundContentsResource(background_contents,
application_name);
@@ -547,7 +546,7 @@ void TaskManagerBackgroundContentsResourceProvider::AddToTaskManager(
}
void TaskManagerBackgroundContentsResourceProvider::Add(
- BackgroundContents* contents, const std::wstring& application_name) {
+ BackgroundContents* contents, const string16& application_name) {
if (!updating_)
return;
@@ -589,7 +588,7 @@ void TaskManagerBackgroundContentsResourceProvider::Observe(
// will display the URL instead in this case. This should never happen
// except in rare cases when an extension is being unloaded or chrome is
// exiting while the task manager is displayed.
- std::wstring application_name;
+ string16 application_name;
ExtensionService* service =
Source<Profile>(source)->GetExtensionService();
if (service) {
@@ -599,7 +598,7 @@ void TaskManagerBackgroundContentsResourceProvider::Observe(
service->GetExtensionById(application_id, false);
// Extension can be NULL when running unit tests.
if (extension)
- application_name = UTF8ToWide(extension->name());
+ application_name = UTF8ToUTF16(extension->name());
}
Add(Details<BackgroundContentsOpenedDetails>(details)->contents,
application_name);
@@ -613,7 +612,7 @@ void TaskManagerBackgroundContentsResourceProvider::Observe(
// Should never get a NAVIGATED before OPENED.
DCHECK(resources_.find(contents) != resources_.end());
// Preserve the application name.
- std::wstring application_name(
+ string16 application_name(
resources_.find(contents)->second->application_name());
Remove(contents);
Add(contents, application_name);
@@ -655,9 +654,9 @@ TaskManagerChildProcessResource::~TaskManagerChildProcessResource() {
}
// TaskManagerResource methods:
-std::wstring TaskManagerChildProcessResource::GetTitle() const {
+string16 TaskManagerChildProcessResource::GetTitle() const {
if (title_.empty())
- title_ = UTF16ToWideHack(child_process_.GetLocalizedTitle());
+ title_ = child_process_.GetLocalizedTitle();
return title_;
}
@@ -886,14 +885,13 @@ TaskManagerExtensionProcessResource::TaskManagerExtensionProcessResource(
int message_id = GetMessagePrefixID(GetExtension()->is_app(), true,
extension_host_->profile()->IsOffTheRecord());
- title_ = UTF16ToWideHack(l10n_util::GetStringFUTF16(message_id,
- extension_name));
+ title_ = l10n_util::GetStringFUTF16(message_id, extension_name);
}
TaskManagerExtensionProcessResource::~TaskManagerExtensionProcessResource() {
}
-std::wstring TaskManagerExtensionProcessResource::GetTitle() const {
+string16 TaskManagerExtensionProcessResource::GetTitle() const {
return title_;
}
@@ -1084,15 +1082,14 @@ TaskManagerNotificationResource::TaskManagerNotificationResource(
}
process_handle_ = balloon_host_->render_view_host()->process()->GetHandle();
pid_ = base::GetProcId(process_handle_);
- title_ = UTF16ToWide(l10n_util::GetStringFUTF16(
- IDS_TASK_MANAGER_NOTIFICATION_PREFIX,
- balloon_host_->GetSource()));
+ title_ = l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_NOTIFICATION_PREFIX,
+ balloon_host_->GetSource());
}
TaskManagerNotificationResource::~TaskManagerNotificationResource() {
}
-std::wstring TaskManagerNotificationResource::GetTitle() const {
+string16 TaskManagerNotificationResource::GetTitle() const {
return title_;
}
@@ -1262,10 +1259,9 @@ TaskManagerBrowserProcessResource::~TaskManagerBrowserProcessResource() {
}
// TaskManagerResource methods:
-std::wstring TaskManagerBrowserProcessResource::GetTitle() const {
+string16 TaskManagerBrowserProcessResource::GetTitle() const {
if (title_.empty()) {
- title_ = UTF16ToWideHack(
- l10n_util::GetStringUTF16(IDS_TASK_MANAGER_WEB_BROWSER_CELL_TEXT));
+ title_ = l10n_util::GetStringUTF16(IDS_TASK_MANAGER_WEB_BROWSER_CELL_TEXT);
}
return title_;
}
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.h b/chrome/browser/task_manager/task_manager_resource_providers.h
index c1c0671..bfa13a0 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.h
+++ b/chrome/browser/task_manager/task_manager_resource_providers.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -10,6 +10,7 @@
#include <vector>
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "base/process_util.h"
#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/common/child_process_info.h"
@@ -35,13 +36,14 @@ class TaskManagerRendererResource : public TaskManager::Resource {
virtual ~TaskManagerRendererResource();
// TaskManager::Resource methods:
- virtual base::ProcessHandle GetProcess() const;
- virtual Type GetType() const;
- virtual bool ReportsCacheStats() const;
- virtual WebKit::WebCache::ResourceTypeStats GetWebCoreCacheStats() const;
- virtual bool ReportsV8MemoryStats() const;
- virtual size_t GetV8MemoryAllocated() const;
- virtual size_t GetV8MemoryUsed() const;
+ virtual base::ProcessHandle GetProcess() const OVERRIDE;
+ virtual Type GetType() const OVERRIDE;
+ virtual bool ReportsCacheStats() const OVERRIDE;
+ virtual WebKit::WebCache::ResourceTypeStats GetWebCoreCacheStats() const
+ OVERRIDE;
+ virtual bool ReportsV8MemoryStats() const OVERRIDE;
+ virtual size_t GetV8MemoryAllocated() const OVERRIDE;
+ virtual size_t GetV8MemoryUsed() const OVERRIDE;
// RenderResources always provide the network usage.
virtual bool SupportNetworkUsage() const;
@@ -81,11 +83,11 @@ class TaskManagerTabContentsResource : public TaskManagerRendererResource {
virtual ~TaskManagerTabContentsResource();
// TaskManager::Resource methods:
- virtual Type GetType() const;
- virtual std::wstring GetTitle() const;
- virtual SkBitmap GetIcon() const;
- virtual TabContents* GetTabContents() const;
- virtual const Extension* GetExtension() const;
+ virtual Type GetType() const OVERRIDE;
+ virtual string16 GetTitle() const OVERRIDE;
+ virtual SkBitmap GetIcon() const OVERRIDE;
+ virtual TabContents* GetTabContents() const OVERRIDE;
+ virtual const Extension* GetExtension() const OVERRIDE;
private:
TabContents* tab_contents_;
@@ -139,19 +141,19 @@ class TaskManagerBackgroundContentsResource
public:
TaskManagerBackgroundContentsResource(
BackgroundContents* background_contents,
- const std::wstring& application_name);
+ const string16& application_name);
virtual ~TaskManagerBackgroundContentsResource();
// TaskManager::Resource methods:
- virtual std::wstring GetTitle() const;
- virtual SkBitmap GetIcon() const;
- virtual bool IsBackground() const;
+ virtual string16 GetTitle() const OVERRIDE;
+ virtual SkBitmap GetIcon() const OVERRIDE;
+ virtual bool IsBackground() const OVERRIDE;
- const std::wstring& application_name() const { return application_name_; }
+ const string16& application_name() const { return application_name_; }
private:
BackgroundContents* background_contents_;
- std::wstring application_name_;
+ string16 application_name_;
// The icon painted for BackgroundContents.
// TODO(atwilson): Use the favicon when there's a way to get the favicon for
@@ -182,11 +184,11 @@ class TaskManagerBackgroundContentsResourceProvider
private:
virtual ~TaskManagerBackgroundContentsResourceProvider();
- void Add(BackgroundContents* background_contents, const std::wstring& title);
+ void Add(BackgroundContents* background_contents, const string16& title);
void Remove(BackgroundContents* background_contents);
void AddToTaskManager(BackgroundContents* background_contents,
- const std::wstring& title);
+ const string16& title);
// Whether we are currently reporting to the task manager. Used to ignore
// notifications sent after StopUpdating().
@@ -210,13 +212,13 @@ class TaskManagerChildProcessResource : public TaskManager::Resource {
explicit TaskManagerChildProcessResource(const ChildProcessInfo& child_proc);
virtual ~TaskManagerChildProcessResource();
- // TaskManagerResource methods:
- virtual std::wstring GetTitle() const;
- virtual SkBitmap GetIcon() const;
- virtual base::ProcessHandle GetProcess() const;
- virtual Type GetType() const;
- virtual bool SupportNetworkUsage() const;
- virtual void SetSupportNetworkUsage();
+ // TaskManager::Resource methods:
+ virtual string16 GetTitle() const OVERRIDE;
+ virtual SkBitmap GetIcon() const OVERRIDE;
+ virtual base::ProcessHandle GetProcess() const OVERRIDE;
+ virtual Type GetType() const OVERRIDE;
+ virtual bool SupportNetworkUsage() const OVERRIDE;
+ virtual void SetSupportNetworkUsage() OVERRIDE;
// Returns the pid of the child process.
int process_id() const { return pid_; }
@@ -224,7 +226,7 @@ class TaskManagerChildProcessResource : public TaskManager::Resource {
private:
ChildProcessInfo child_process_;
int pid_;
- mutable std::wstring title_;
+ mutable string16 title_;
bool network_usage_support_;
// The icon painted for the child processs.
@@ -294,14 +296,14 @@ class TaskManagerExtensionProcessResource : public TaskManager::Resource {
explicit TaskManagerExtensionProcessResource(ExtensionHost* extension_host);
virtual ~TaskManagerExtensionProcessResource();
- // TaskManagerResource methods:
- virtual std::wstring GetTitle() const;
- virtual SkBitmap GetIcon() const;
- virtual base::ProcessHandle GetProcess() const;
- virtual Type GetType() const;
- virtual bool SupportNetworkUsage() const;
- virtual void SetSupportNetworkUsage();
- virtual const Extension* GetExtension() const;
+ // TaskManager::Resource methods:
+ virtual string16 GetTitle() const OVERRIDE;
+ virtual SkBitmap GetIcon() const OVERRIDE;
+ virtual base::ProcessHandle GetProcess() const OVERRIDE;
+ virtual Type GetType() const OVERRIDE;
+ virtual bool SupportNetworkUsage() const OVERRIDE;
+ virtual void SetSupportNetworkUsage() OVERRIDE;
+ virtual const Extension* GetExtension() const OVERRIDE;
// Returns the pid of the extension process.
int process_id() const { return pid_; }
@@ -318,7 +320,7 @@ class TaskManagerExtensionProcessResource : public TaskManager::Resource {
// Cached data about the extension.
base::ProcessHandle process_handle_;
int pid_;
- std::wstring title_;
+ string16 title_;
DISALLOW_COPY_AND_ASSIGN(TaskManagerExtensionProcessResource);
};
@@ -370,12 +372,12 @@ class TaskManagerNotificationResource : public TaskManager::Resource {
virtual ~TaskManagerNotificationResource();
// TaskManager::Resource interface
- virtual std::wstring GetTitle() const;
- virtual SkBitmap GetIcon() const;
- virtual base::ProcessHandle GetProcess() const;
- virtual Type GetType() const;
- virtual bool SupportNetworkUsage() const;
- virtual void SetSupportNetworkUsage() { }
+ virtual string16 GetTitle() const OVERRIDE;
+ virtual SkBitmap GetIcon() const OVERRIDE;
+ virtual base::ProcessHandle GetProcess() const OVERRIDE;
+ virtual Type GetType() const OVERRIDE;
+ virtual bool SupportNetworkUsage() const OVERRIDE;
+ virtual void SetSupportNetworkUsage() OVERRIDE { }
private:
// The icon painted for notifications. .
@@ -387,7 +389,7 @@ class TaskManagerNotificationResource : public TaskManager::Resource {
// Cached data about the balloon host.
base::ProcessHandle process_handle_;
int pid_;
- std::wstring title_;
+ string16 title_;
DISALLOW_COPY_AND_ASSIGN(TaskManagerNotificationResource);
};
@@ -434,17 +436,17 @@ class TaskManagerBrowserProcessResource : public TaskManager::Resource {
TaskManagerBrowserProcessResource();
virtual ~TaskManagerBrowserProcessResource();
- // TaskManagerResource methods:
- virtual std::wstring GetTitle() const;
- virtual SkBitmap GetIcon() const;
- virtual base::ProcessHandle GetProcess() const;
- virtual Type GetType() const;
+ // TaskManager::Resource methods:
+ virtual string16 GetTitle() const OVERRIDE;
+ virtual SkBitmap GetIcon() const OVERRIDE;
+ virtual base::ProcessHandle GetProcess() const OVERRIDE;
+ virtual Type GetType() const OVERRIDE;
- virtual bool SupportNetworkUsage() const;
- virtual void SetSupportNetworkUsage();
+ virtual bool SupportNetworkUsage() const OVERRIDE;
+ virtual void SetSupportNetworkUsage() OVERRIDE;
- virtual bool ReportsSqliteMemoryUsed() const;
- virtual size_t SqliteMemoryUsedBytes() const;
+ virtual bool ReportsSqliteMemoryUsed() const OVERRIDE;
+ virtual size_t SqliteMemoryUsedBytes() const OVERRIDE;
// Returns the pid of the browser process.
int process_id() const { return pid_; }
@@ -452,7 +454,7 @@ class TaskManagerBrowserProcessResource : public TaskManager::Resource {
private:
base::ProcessHandle process_;
int pid_;
- mutable std::wstring title_;
+ mutable string16 title_;
static SkBitmap* default_icon_;
diff --git a/chrome/browser/task_manager/task_manager_unittest.cc b/chrome/browser/task_manager/task_manager_unittest.cc
index a4e93f5..d7478a4 100644
--- a/chrome/browser/task_manager/task_manager_unittest.cc
+++ b/chrome/browser/task_manager/task_manager_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -30,7 +30,9 @@ class TestResource : public TaskManager::Resource {
public:
TestResource() : refresh_called_(false) {}
- virtual std::wstring GetTitle() const { return L"test title"; }
+ virtual string16 GetTitle() const OVERRIDE {
+ return ASCIIToUTF16("test title");
+ }
virtual SkBitmap GetIcon() const { return SkBitmap(); }
virtual base::ProcessHandle GetProcess() const {
return base::GetCurrentProcessHandle();
generated by cgit v1.1 at 2025-03-11 06:53:58 +0000