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

Unified Diff: chrome/browser/task_management/providers/web_contents/subframe_task.cc

Issue 2012623002: Don't display chrome-extension URLs for subframes in the TaskManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@activate_extension
Patch Set: Subframe. Created 4 years, 7 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_management/providers/web_contents/subframe_task.cc
diff --git a/chrome/browser/task_management/providers/web_contents/subframe_task.cc b/chrome/browser/task_management/providers/web_contents/subframe_task.cc
index 258ba7075383af97d46d5d9183514cf2e4885038..ddba14294e9e4fa0bdb302b271e58e6bcaf13656 100644
--- a/chrome/browser/task_management/providers/web_contents/subframe_task.cc
+++ b/chrome/browser/task_management/providers/web_contents/subframe_task.cc
@@ -11,6 +11,10 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/common/constants.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
#include "ui/base/l10n/l10n_util.h"
namespace task_management {
@@ -19,12 +23,27 @@ namespace {
base::string16 AdjustTitle(const content::SiteInstance* site_instance) {
DCHECK(site_instance);
+
+ // By default, subframe rows display the site, like this:
+ // "Subframe: http://example.com/"
+ const GURL& site_url = site_instance->GetSiteURL();
+ std::string name = site_url.spec();
+
+ // If |site_url| wraps a chrome extension id, we can display the extension
+ // name instead, which is more human-readable.
+ if (site_url.SchemeIs(extensions::kExtensionScheme)) {
+ const extensions::Extension* extension =
+ extensions::ExtensionRegistry::Get(site_instance->GetBrowserContext())
+ ->enabled_extensions()
+ .GetExtensionOrAppByURL(site_url);
+ if (extension)
+ name = extension->name();
+ }
+
int message_id = site_instance->GetBrowserContext()->IsOffTheRecord() ?
IDS_TASK_MANAGER_SUBFRAME_INCOGNITO_PREFIX :
IDS_TASK_MANAGER_SUBFRAME_PREFIX;
-
- return l10n_util::GetStringFUTF16(message_id, base::UTF8ToUTF16(
- site_instance->GetSiteURL().spec()));
+ return l10n_util::GetStringFUTF16(message_id, base::UTF8ToUTF16(name));
}
} // namespace
« 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