| Index: chrome/browser/task_manager/tab_contents_resource_provider.cc
|
| diff --git a/chrome/browser/task_manager/tab_contents_resource_provider.cc b/chrome/browser/task_manager/tab_contents_resource_provider.cc
|
| index 9b79cc145eb5b15ee8ab87c60ca043c794053a81..61bb03abc8bd76c125e9dda095b32400a1c78c5f 100644
|
| --- a/chrome/browser/task_manager/tab_contents_resource_provider.cc
|
| +++ b/chrome/browser/task_manager/tab_contents_resource_provider.cc
|
| @@ -13,8 +13,6 @@
|
| #include "chrome/browser/prerender/prerender_manager_factory.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| -#include "chrome/browser/search/instant_service.h"
|
| -#include "chrome/browser/search/instant_service_factory.h"
|
| #include "chrome/browser/search/search.h"
|
| #include "chrome/browser/tab_contents/tab_util.h"
|
| #include "chrome/browser/task_manager/renderer_resource.h"
|
| @@ -89,7 +87,6 @@ class TabContentsResource : public RendererResource {
|
| static gfx::ImageSkia* prerender_icon_;
|
| content::WebContents* web_contents_;
|
| Profile* profile_;
|
| - bool is_instant_ntp_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TabContentsResource);
|
| };
|
| @@ -101,8 +98,7 @@ TabContentsResource::TabContentsResource(
|
| : RendererResource(web_contents->GetRenderProcessHost()->GetHandle(),
|
| web_contents->GetRenderViewHost()),
|
| web_contents_(web_contents),
|
| - profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
|
| - is_instant_ntp_(chrome::IsPreloadedInstantExtendedNTP(web_contents)) {
|
| + profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())) {
|
| if (!prerender_icon_) {
|
| ResourceBundle& rb = ResourceBundle::GetSharedInstance();
|
| prerender_icon_ = rb.GetImageSkiaNamed(IDR_PRERENDER);
|
| @@ -138,7 +134,6 @@ base::string16 TabContentsResource::GetTitle() const {
|
| HostsExtension(),
|
| profile_->IsOffTheRecord(),
|
| IsContentsPrerendering(web_contents_),
|
| - is_instant_ntp_,
|
| false); // is_background
|
| return l10n_util::GetStringFUTF16(message_id, tab_title);
|
| }
|
| @@ -237,14 +232,6 @@ void TabContentsResourceProvider::StartUpdating() {
|
| }
|
| }
|
|
|
| - // Add all the Instant Extended prerendered NTPs.
|
| - for (size_t i = 0; i < profiles.size(); ++i) {
|
| - const InstantService* instant_service =
|
| - InstantServiceFactory::GetForProfile(profiles[i]);
|
| - if (instant_service && instant_service->GetNTPContents())
|
| - Add(instant_service->GetNTPContents());
|
| - }
|
| -
|
| #if defined(ENABLE_FULL_PRINTING)
|
| // Add all the pages being background printed.
|
| printing::BackgroundPrintingManager* printing_manager =
|
| @@ -298,7 +285,6 @@ void TabContentsResourceProvider::Add(WebContents* web_contents) {
|
| // pages, prerender pages, and background printed pages.
|
| if (!chrome::FindBrowserWithWebContents(web_contents) &&
|
| !IsContentsPrerendering(web_contents) &&
|
| - !chrome::IsPreloadedInstantExtendedNTP(web_contents) &&
|
| !IsContentsBackgroundPrinted(web_contents) &&
|
| !DevToolsWindow::IsDevToolsWindow(web_contents->GetRenderViewHost())) {
|
| return;
|
|
|