Add "Instant:" prefix to Instant preview tabs in the Task manager.

chrome/browser/task_manager/task_manager_resource_providers.cc

 // 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.
 
 #include "chrome/browser/task_manager/task_manager_resource_providers.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_version_info.h"
 #include "base/i18n/rtl.h"
 #include "base/process_util.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
+#include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tab_contents/background_contents.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/app_icon_win.h"
 #include "ui/gfx/icon_util.h"
 #endif  // defined(OS_WIN)
 
 using content::BrowserThread;
 
 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_incognito, bool is_prerender) {
+int GetMessagePrefixID(bool is_app,
+                       bool is_extension,
+                       bool is_incognito,
+                       bool is_prerender,
+                       bool is_instant_preview) {
   if (is_app) {
     if (is_incognito)
       return IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX;
     else
       return IDS_TASK_MANAGER_APP_PREFIX;
   } else if (is_extension) {
     if (is_incognito)
       return IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX;
     else
       return IDS_TASK_MANAGER_EXTENSION_PREFIX;
   } else if (is_prerender) {
     return IDS_TASK_MANAGER_PRERENDER_PREFIX;
+  } else if (is_instant_preview) {
+    return IDS_TASK_MANAGER_INSTANT_PREVIEW_PREFIX;
   } else {
     return IDS_TASK_MANAGER_TAB_PREFIX;
   }
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerRendererResource class
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 112 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // static
 SkBitmap* TaskManagerTabContentsResource::prerender_icon_ = NULL;
 
 TaskManagerTabContentsResource::TaskManagerTabContentsResource(
     TabContentsWrapper* tab_contents)
     : TaskManagerRendererResource(
           tab_contents->tab_contents()->GetRenderProcessHost()->GetHandle(),
           tab_contents->render_view_host()),
-      tab_contents_(tab_contents) {
+      tab_contents_(tab_contents),
+      is_instant_preview_(false) {
   if (!prerender_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     prerender_icon_ = rb.GetBitmapNamed(IDR_PRERENDER);
   }
+  for (BrowserList::const_iterator i = BrowserList::begin();
+       i != BrowserList::end(); ++i) {
+    if ((*i)->instant() &&
+        (*i)->instant()->GetPreviewContents() == tab_contents_) {
+      is_instant_preview_ = true;
+      break;
+    }
+  }
 }
 
 TaskManagerTabContentsResource::~TaskManagerTabContentsResource() {
 }
 
+void TaskManagerTabContentsResource::InstantCommitted() {
+  DCHECK(is_instant_preview_);
+  is_instant_preview_ = false;
+}
+
 bool TaskManagerTabContentsResource::IsPrerendering() const {
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(
           tab_contents_->profile());
   return prerender_manager &&
          prerender_manager->IsTabContentsPrerendering(
              tab_contents_->tab_contents());
 }
 
 bool TaskManagerTabContentsResource::HostsExtension() const {
@@ skipping 33 matching lines @@
   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,
       HostsExtension(),
       tab_contents_->profile()->IsOffTheRecord(),
-      IsPrerendering());
+      IsPrerendering(),
+      is_instant_preview_);
   return l10n_util::GetStringFUTF16(message_id, tab_title);
 }
 
 string16 TaskManagerTabContentsResource::GetProfileName() const {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   Profile* profile = tab_contents_->profile()->GetOriginalProfile();
   size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   if (index == std::string::npos)
     return string16();
@@ skipping 76 matching lines @@
   registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_SWAPPED,
                  content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DISCONNECTED,
                  content::NotificationService::AllBrowserContextsAndSources());
   // TAB_CONTENTS_DISCONNECTED should be enough to know when to remove a
   // resource.  This is an attempt at mitigating a crasher that seem to
   // indicate a resource is still referencing a deleted TabContents
   // (http://crbug.com/7321).
   registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                  content::NotificationService::AllBrowserContextsAndSources());
+  registrar_.Add(this, chrome::NOTIFICATION_INSTANT_COMMITTED,
+                 content::NotificationService::AllBrowserContextsAndSources());
 }
 
 void TaskManagerTabContentsResourceProvider::StopUpdating() {
   DCHECK(updating_);
   updating_ = false;
 
   // Then we unregister for notifications to get new tabs.
   registrar_.Remove(
       this, content::NOTIFICATION_TAB_CONTENTS_CONNECTED,
       content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Remove(
       this, content::NOTIFICATION_TAB_CONTENTS_SWAPPED,
       content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Remove(
       this, content::NOTIFICATION_TAB_CONTENTS_DISCONNECTED,
       content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Remove(
       this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
       content::NotificationService::AllBrowserContextsAndSources());
+  registrar_.Remove(
+      this, chrome::NOTIFICATION_INSTANT_COMMITTED,
+      content::NotificationService::AllBrowserContextsAndSources());
 
   // Delete all the resources.
   STLDeleteContainerPairSecondPointers(resources_.begin(), resources_.end());
 
   resources_.clear();
 }
 
 void TaskManagerTabContentsResourceProvider::AddToTaskManager(
     TabContentsWrapper* tab_contents) {
   TaskManagerTabContentsResource* resource =
@@ skipping 41 matching lines @@
 
   // Remove the resource from the Task Manager.
   TaskManagerTabContentsResource* resource = iter->second;
   task_manager_->RemoveResource(resource);
   // And from the provider.
   resources_.erase(iter);
   // Finally, delete the resource.
   delete resource;
 }
 
+void TaskManagerTabContentsResourceProvider::Update(
+    TabContentsWrapper* tab_contents) {
+  if (!updating_)
+    return;
+  std::map<TabContentsWrapper*, 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) {
-  TabContentsWrapper* tab_contents =
-      TabContentsWrapper::GetCurrentWrapperForContents(
-          content::Source<TabContents>(source).ptr());
+  TabContentsWrapper* tab_contents;
+  if (type == chrome::NOTIFICATION_INSTANT_COMMITTED) {
+    tab_contents = content::Source<TabContentsWrapper>(source).ptr();
+  } else {
+    tab_contents = TabContentsWrapper::GetCurrentWrapperForContents(
+        content::Source<TabContents>(source).ptr());
+  }
   // A background page does not have a TabContentsWrapper.
   if (!tab_contents)
     return;
   switch (type) {
     case content::NOTIFICATION_TAB_CONTENTS_CONNECTED:
       Add(tab_contents);
       break;
     case content::NOTIFICATION_TAB_CONTENTS_SWAPPED:
       Remove(tab_contents);
       Add(tab_contents);
       break;
     case content::NOTIFICATION_TAB_CONTENTS_DESTROYED:
       // If this DCHECK is triggered, it could explain http://crbug.com/7321 .
       DCHECK(resources_.find(tab_contents) ==
              resources_.end()) << "TAB_CONTENTS_DESTROYED with no associated "
                                   "TAB_CONTENTS_DISCONNECTED";
       // Fall through.
     case content::NOTIFICATION_TAB_CONTENTS_DISCONNECTED:
       Remove(tab_contents);
       break;
+    case chrome::NOTIFICATION_INSTANT_COMMITTED:
+      Update(tab_contents);
+      break;
     default:
       NOTREACHED() << "Unexpected notification.";
       return;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerBackgroundContentsResource class
 ////////////////////////////////////////////////////////////////////////////////
 
@@ skipping 566 matching lines @@
   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_);
   string16 extension_name = UTF8ToUTF16(GetExtension()->name());
   DCHECK(!extension_name.empty());
 
   int message_id = GetMessagePrefixID(GetExtension()->is_app(), true,
-      extension_host_->profile()->IsOffTheRecord(), false);
+      extension_host_->profile()->IsOffTheRecord(), false, false);
   title_ = l10n_util::GetStringFUTF16(message_id, extension_name);
 }
 
 TaskManagerExtensionProcessResource::~TaskManagerExtensionProcessResource() {
 }
 
 string16 TaskManagerExtensionProcessResource::GetTitle() const {
   return title_;
 }
 
@@ skipping 310 matching lines @@
 
   return &resource_;
 }
 
 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
 }