Show extension tabs in task manager and correctly label apps.

chrome/browser/task_manager/task_manager_resource_providers.cc

 // Copyright (c) 2010 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_resource_providers.h"
 
 #include "build/build_config.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 32 matching lines @@
 #include "grit/theme_resources.h"
 
 #if defined(OS_MACOSX)
 #include "skia/ext/skia_utils_mac.h"
 #endif
 #if defined(OS_WIN)
 #include "chrome/browser/app_icon_win.h"
 #include "gfx/icon_util.h"
 #endif  // defined(OS_WIN)
 
+namespace {
+
+// Returns the appropriate message prefix ID for tabs and extensions,
+// reflecting whether they are apps or in incognito mode.
+int GetMessagePrefixID(bool is_app, bool is_extension,
+    bool is_off_the_record) {
+  return is_app ?
+      (is_off_the_record ?
+          IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX :
+          IDS_TASK_MANAGER_APP_PREFIX) :
+      (is_extension ?
+          (is_off_the_record ?
+              IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX :
+              IDS_TASK_MANAGER_EXTENSION_PREFIX) :
+          IDS_TASK_MANAGER_TAB_PREFIX);
+}
+
+}  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerRendererResource class
 ////////////////////////////////////////////////////////////////////////////////
 TaskManagerRendererResource::TaskManagerRendererResource(
     base::ProcessHandle process, RenderViewHost* render_view_host)
     : process_(process),
       render_view_host_(render_view_host),
       pending_stats_update_(false),
       v8_memory_allocated_(0),
@@ skipping 61 matching lines @@
     TabContents* tab_contents)
     : TaskManagerRendererResource(
           tab_contents->GetRenderProcessHost()->GetHandle(),
           tab_contents->render_view_host()),
       tab_contents_(tab_contents) {
 }
 
 TaskManagerTabContentsResource::~TaskManagerTabContentsResource() {
 }
 
+TaskManager::Resource::Type TaskManagerTabContentsResource::GetType() const {
+  if (tab_contents_->HostsExtension())

[Erik does not do reviews, 2010/12/03 17:04:56]

in cases like this I usually prefer:
return tab_contents_->HostsExtension() ? EXTENSION : RENDERER;

but I don't care too much :-)

[Charlie Reis, 2010/12/03 23:02:16]

Done.

+    return EXTENSION;
+
+  return RENDERER;
+}
+
 std::wstring TaskManagerTabContentsResource::GetTitle() const {
   // Fall back on the URL if there's no title.
   std::wstring tab_title(UTF16ToWideHack(tab_contents_->GetTitle()));
   if (tab_title.empty()) {
     tab_title = UTF8ToWide(tab_contents_->GetURL().spec());
     // Force URL to be LTR.
     tab_title = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
         WideToUTF16(tab_title)));
   } else {
     // Since the tab_title will be concatenated with
     // IDS_TASK_MANAGER_TAB_PREFIX, we need to explicitly set the tab_title to
     // be LTR format if there is no strong RTL charater in it. Otherwise, if
     // IDS_TASK_MANAGER_TAB_PREFIX is an RTL word, the concatenated result
     // might be wrong. For example, http://mail.yahoo.com, whose title is
     // "Yahoo! Mail: The best web-based Email!", without setting it explicitly
     // as LTR format, the concatenated result will be "!Yahoo! Mail: The best
     // web-based Email :BAT", in which the capital letters "BAT" stands for
     // the Hebrew word for "tab".
     base::i18n::AdjustStringForLocaleDirection(&tab_title);
   }
 
-  return l10n_util::GetStringF(IDS_TASK_MANAGER_TAB_PREFIX, tab_title);
+  int message_id = GetMessagePrefixID(tab_contents_->IsInstalledApp(),
+      tab_contents_->HostsExtension(),
+      tab_contents_->profile()->IsOffTheRecord());
+  return l10n_util::GetStringF(message_id, tab_title);
 }
 
-
 SkBitmap TaskManagerTabContentsResource::GetIcon() const {
   return tab_contents_->GetFavIcon();
 }
 
 TabContents* TaskManagerTabContentsResource::GetTabContents() const {
   return static_cast<TabContents*>(tab_contents_);
 }
 
+const Extension* TaskManagerTabContentsResource::GetExtension() const {
+  if (tab_contents_->HostsExtension()) {
+    ExtensionsService* extensions_service =
+        tab_contents_->profile()->GetExtensionsService();
+    return extensions_service->GetExtensionByURL(tab_contents_->GetURL());
+  }
+
+  return NULL;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerTabContentsResourceProvider class
 ////////////////////////////////////////////////////////////////////////////////
 
 TaskManagerTabContentsResourceProvider::
     TaskManagerTabContentsResourceProvider(TaskManager* task_manager)
     :  updating_(false),
        task_manager_(task_manager) {
 }
 
@@ skipping 83 matching lines @@
       new TaskManagerTabContentsResource(tab_contents);
   resources_[tab_contents] = resource;
   task_manager_->AddResource(resource);
 }
 
 void TaskManagerTabContentsResourceProvider::Add(TabContents* tab_contents) {
   if (!updating_)
     return;
 
   // Don't add dead tabs or tabs that haven't yet connected.
-  // Also ignore tabs which display extension content. We collapse
-  // all of these into one extension row.
   if (!tab_contents->GetRenderProcessHost()->GetHandle() ||
-      !tab_contents->notify_disconnection() ||
-      tab_contents->HostsExtension()) {
+      !tab_contents->notify_disconnection()) {
     return;
   }
 
   std::map<TabContents*, TaskManagerTabContentsResource*>::const_iterator
       iter = resources_.find(tab_contents);
   if (iter != resources_.end()) {
     // The case may happen that we have added a TabContents as part of the
     // iteration performed during StartUpdating() call but the notification that
     // it has connected was not fired yet. So when the notification happens, we
     // already know about this tab and just ignore it.
@@ skipping 534 matching lines @@
     : extension_host_(extension_host) {
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN);
   }
   process_handle_ = extension_host_->render_process_host()->GetHandle();
   pid_ = base::GetProcId(process_handle_);
   std::wstring extension_name(UTF8ToWide(GetExtension()->name()));
   DCHECK(!extension_name.empty());
 
-  int message_id =
-      GetExtension()->is_app() ?
-          (extension_host_->profile()->IsOffTheRecord() ?
-              IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX :
-              IDS_TASK_MANAGER_APP_PREFIX) :
-          (extension_host_->profile()->IsOffTheRecord() ?
-              IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX :
-              IDS_TASK_MANAGER_EXTENSION_PREFIX);
+  int message_id = GetMessagePrefixID(GetExtension()->is_app(), true,
+      extension_host_->profile()->IsOffTheRecord());
   title_ = l10n_util::GetStringF(message_id, extension_name);
 }
 
 TaskManagerExtensionProcessResource::~TaskManagerExtensionProcessResource() {
 }
 
 std::wstring TaskManagerExtensionProcessResource::GetTitle() const {
   return title_;
 }
 
@@ skipping 380 matching lines @@
 
   return &resource_;
 }
 
 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
 }