Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2849)

Unified Diff: chrome/browser/task_manager/task_manager_resource_providers.cc

Issue 10834345: Label background pages as such for packaged apps in task manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/task_manager/task_manager_resource_providers.cc
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index dbc26f76e4d17f6cd3d43d3cf8e825bcb447e7cd..b4eccbc01c1449c9490d22dec420d142825204cd 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -85,12 +85,16 @@ int GetMessagePrefixID(bool is_app,
bool is_extension,
bool is_incognito,
bool is_prerender,
- bool is_instant_preview) {
+ bool is_instant_preview,
+ bool is_background) {
if (is_app) {
- if (is_incognito)
+ if (is_background) {
+ return IDS_TASK_MANAGER_BACKGROUND_PREFIX;
+ } else if (is_incognito) {
return IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX;
- else
+ } else {
return IDS_TASK_MANAGER_APP_PREFIX;
+ }
} else if (is_extension) {
if (is_incognito)
return IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX;
@@ -323,7 +327,8 @@ string16 TaskManagerTabContentsResource::GetTitle() const {
HostsExtension(),
tab_contents_->profile()->IsOffTheRecord(),
IsPrerendering(),
- is_instant_preview_);
+ is_instant_preview_,
+ false);
return l10n_util::GetStringFUTF16(message_id, tab_title);
}
@@ -540,7 +545,7 @@ TaskManagerPanelResource::TaskManagerPanelResource(Panel* panel)
panel_(panel) {
message_prefix_id_ = GetMessagePrefixID(
GetExtension()->is_app(), true, panel->profile()->IsOffTheRecord(),
- false, false);
+ false, false, false);
}
TaskManagerPanelResource::~TaskManagerPanelResource() {
@@ -1325,7 +1330,7 @@ TaskManagerExtensionProcessResource::TaskManagerExtensionProcessResource(
Profile* profile = Profile::FromBrowserContext(
render_view_host->GetProcess()->GetBrowserContext());
int message_id = GetMessagePrefixID(GetExtension()->is_app(), true,
- profile->IsOffTheRecord(), false, false);
+ profile->IsOffTheRecord(), false, false, IsBackground());
title_ = l10n_util::GetStringFUTF16(message_id, extension_name);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698