Do not add TabContents from packaged apps to the task manager.

chrome/browser/task_manager/task_manager_resource_providers.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_resource_providers.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 129 matching lines @@
     // 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(&title);
   }
   return title;
 }
 
+// Only classify as an app if the URL is an app and the tab is hosting an
+// extension process.  (It's possible to be showing the URL from before it
+// was installed as an app.)  Return Extension::TYPE_UNKNOWN if the web_contents
+// is not for an extension, not for an app, or the process is not hosting an
+// extension.
+Extension::Type GetAppExtensionType(WebContents* web_contents) {
+  ExtensionService* extension_service = Profile::FromBrowserContext(
+      web_contents->GetBrowserContext())->GetExtensionService();
+  const Extension* extension =
+      extension_service->GetInstalledApp(web_contents->GetURL());
+
+  if (!extension || !extension->is_app())
+    return Extension::TYPE_UNKNOWN;
+
+  const extensions::ProcessMap* process_map = extension_service->process_map();
+  if (!process_map->Contains(web_contents->GetRenderProcessHost()->GetID()))
+    return Extension::TYPE_UNKNOWN;
+
+  return extension->GetType();
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerRendererResource class
 ////////////////////////////////////////////////////////////////////////////////
 TaskManagerRendererResource::TaskManagerRendererResource(
     base::ProcessHandle process, content::RenderViewHost* render_view_host)
     : process_(process),
       render_view_host_(render_view_host),
       pending_stats_update_(false),
@@ skipping 157 matching lines @@
 TaskManager::Resource::Type TaskManagerTabContentsResource::GetType() const {
   return HostsExtension() ? EXTENSION : RENDERER;
 }
 
 string16 TaskManagerTabContentsResource::GetTitle() const {
   // Fall back on the URL if there's no title.
   WebContents* contents = tab_contents_->web_contents();
   GURL url = contents->GetURL();
   string16 tab_title = GetTitleFromWebContents(contents);
 
-  // Only classify as an app if the URL is an app and the tab is hosting an
-  // extension process.  (It's possible to be showing the URL from before it
-  // was installed as an app.)
-  ExtensionService* extension_service =
-      tab_contents_->profile()->GetExtensionService();
-  extensions::ProcessMap* process_map = extension_service->process_map();
-  bool is_app = extension_service->IsInstalledApp(url) &&
-      process_map->Contains(contents->GetRenderProcessHost()->GetID());
-
   int message_id = GetMessagePrefixID(
-      is_app,
+      GetAppExtensionType(contents) != Extension::TYPE_UNKNOWN,
       HostsExtension(),
       tab_contents_->profile()->IsOffTheRecord(),
       IsPrerendering(),
       is_instant_preview_,
       false);
   return l10n_util::GetStringFUTF16(message_id, tab_title);
 }
 
 string16 TaskManagerTabContentsResource::GetProfileName() const {
   return GetProfileNameFromInfoCache(tab_contents_->profile());
@@ skipping 157 matching lines @@
   std::map<TabContents*, TaskManagerTabContentsResource*>::iterator
       iter = resources_.find(tab_contents);
   DCHECK(iter != resources_.end());
   if (iter != resources_.end())
     iter->second->InstantCommitted();
 }
 
 void TaskManagerTabContentsResourceProvider::Observe(int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  TabContents* tab_contents;
-  tab_contents = TabContents::FromWebContents(
-      content::Source<WebContents>(source).ptr());
+  WebContents* web_contents = content::Source<WebContents>(source).ptr();
+  TabContents* tab_contents = TabContents::FromWebContents(web_contents);
   // A background page does not have a TabContents.
   if (!tab_contents)
     return;
+
+  // Platform Apps' contents are tracked using the RenderViewHost associated
+  // with the extension in the TaskManagerExtensionProcessResourceProvider.
+  if (GetAppExtensionType(web_contents) == Extension::TYPE_PLATFORM_APP)
+    return;
+
   switch (type) {
     case content::NOTIFICATION_WEB_CONTENTS_CONNECTED:
       Add(tab_contents);
       break;
     case content::NOTIFICATION_WEB_CONTENTS_SWAPPED:
       Remove(tab_contents);
       Add(tab_contents);
       break;
     case content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED:
       Remove(tab_contents);
@@ skipping 1337 matching lines @@
     case content::NOTIFICATION_WEB_CONTENTS_CONNECTED:
       Add(web_contents->GetRenderViewHost());
       break;
     case content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED:
       Remove(web_contents->GetRenderViewHost());
       break;
     default:
       NOTREACHED() << "Unexpected notification.";
   }
 }