Chromium Code Reviews| 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 42e0fc14615b11aff6c0923821701e9338953fac..e83ad70b0bd8dd53a45f0d1e1da1f92bb11afe7d 100644 |
| --- a/chrome/browser/task_manager/task_manager_resource_providers.cc |
| +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc |
| @@ -25,6 +25,7 @@ |
| #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" |
| @@ -69,8 +70,8 @@ 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, |
|
sky
2011/12/01 01:48:56
nit: when you wrap each param on its own line.
sreeram
2011/12/01 20:35:26
Done.
|
| + bool is_prerender, bool is_instant_preview) { |
| if (is_app) { |
| if (is_incognito) |
| return IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX; |
| @@ -83,6 +84,8 @@ int GetMessagePrefixID(bool is_app, bool is_extension, |
| 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; |
| } |
| @@ -234,6 +237,17 @@ bool TaskManagerTabContentsResource::IsPrerendering() const { |
| tab_contents_->tab_contents()); |
| } |
| +bool TaskManagerTabContentsResource::IsInstantPreview() const { |
| + for (BrowserList::const_iterator i = BrowserList::begin(); |
|
sky
2011/12/01 01:48:56
How often is this called? Should it be cached?
sreeram
2011/12/01 20:35:26
Done.
|
| + i != BrowserList::end(); ++i) { |
| + if ((*i)->instant() && |
| + (*i)->instant()->GetPreviewContents() == tab_contents_) { |
| + return true; |
| + } |
| + } |
| + return false; |
| +} |
| + |
| bool TaskManagerTabContentsResource::HostsExtension() const { |
| return tab_contents_->tab_contents()->GetURL().SchemeIs( |
| chrome::kExtensionScheme); |
| @@ -278,7 +292,8 @@ string16 TaskManagerTabContentsResource::GetTitle() const { |
| is_app, |
| HostsExtension(), |
| tab_contents_->profile()->IsOffTheRecord(), |
| - IsPrerendering()); |
| + IsPrerendering(), |
| + IsInstantPreview()); |
| return l10n_util::GetStringFUTF16(message_id, tab_title); |
| } |
| @@ -1067,7 +1082,7 @@ TaskManagerExtensionProcessResource::TaskManagerExtensionProcessResource( |
| 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); |
| } |