diff options
Diffstat (limited to 'chrome/browser/task_manager')
6 files changed, 9 insertions, 32 deletions
diff --git a/chrome/browser/task_manager/extension_process_resource_provider.cc b/chrome/browser/task_manager/extension_process_resource_provider.cc index 1db73a1..570061a 100644 --- a/chrome/browser/task_manager/extension_process_resource_provider.cc +++ b/chrome/browser/task_manager/extension_process_resource_provider.cc @@ -98,7 +98,6 @@ ExtensionProcessResource::ExtensionProcessResource( true, // is_extension profile->IsOffTheRecord(), false, // is_prerender - false, // is_instant_overlay IsBackground()); title_ = l10n_util::GetStringFUTF16(message_id, extension_name); } diff --git a/chrome/browser/task_manager/panel_resource_provider.cc b/chrome/browser/task_manager/panel_resource_provider.cc index 18ea3b5..8f65207 100644 --- a/chrome/browser/task_manager/panel_resource_provider.cc +++ b/chrome/browser/task_manager/panel_resource_provider.cc @@ -62,7 +62,6 @@ PanelResource::PanelResource(Panel* panel) true, // is_extension panel->profile()->IsOffTheRecord(), false, // is_prerender - false, // is_instant_overlay false); // is_background } diff --git a/chrome/browser/task_manager/tab_contents_resource_provider.cc b/chrome/browser/task_manager/tab_contents_resource_provider.cc index 8bf392a..af7115d 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 = @@ -300,7 +287,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; diff --git a/chrome/browser/task_manager/task_manager_util.cc b/chrome/browser/task_manager/task_manager_util.cc index d584f90..b755e12 100644 --- a/chrome/browser/task_manager/task_manager_util.cc +++ b/chrome/browser/task_manager/task_manager_util.cc @@ -23,7 +23,6 @@ int GetMessagePrefixID(bool is_app, bool is_extension, bool is_incognito, bool is_prerender, - bool is_instant_overlay, bool is_background) { if (is_app) { if (is_background) @@ -39,8 +38,6 @@ int GetMessagePrefixID(bool is_app, } if (is_prerender) return IDS_TASK_MANAGER_PRERENDER_PREFIX; - if (is_instant_overlay) - return IDS_TASK_MANAGER_INSTANT_OVERLAY_PREFIX; if (is_incognito) return IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX; diff --git a/chrome/browser/task_manager/task_manager_util.h b/chrome/browser/task_manager/task_manager_util.h index 1b95c16..409043b 100644 --- a/chrome/browser/task_manager/task_manager_util.h +++ b/chrome/browser/task_manager/task_manager_util.h @@ -24,7 +24,6 @@ int GetMessagePrefixID(bool is_app, bool is_extension, bool is_incognito, bool is_prerender, - bool is_instant_overlay, bool is_background); // Returns the name of profle from InfoCache. diff --git a/chrome/browser/task_manager/task_manager_util_unittest.cc b/chrome/browser/task_manager/task_manager_util_unittest.cc index 1949df5..a1f9ccf 100644 --- a/chrome/browser/task_manager/task_manager_util_unittest.cc +++ b/chrome/browser/task_manager/task_manager_util_unittest.cc @@ -18,28 +18,25 @@ TEST(TaskManagerUtilTest, GetMessagePrefixID) { bool is_extension; bool is_incognito; bool is_prerender; - bool is_instant_overlay; bool is_background; int expected_result; }; const Configuration configs[] = { // Use implicit int->bool conversion to save space and keep alignment. - {1, 0, 0, 0, 0, 1, IDS_TASK_MANAGER_BACKGROUND_PREFIX}, - {1, 0, 1, 0, 0, 0, IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX}, - {1, 0, 0, 0, 0, 0, IDS_TASK_MANAGER_APP_PREFIX}, - {0, 1, 1, 0, 0, 0, IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX}, - {0, 1, 0, 0, 0, 0, IDS_TASK_MANAGER_EXTENSION_PREFIX}, - {0, 0, 0, 1, 0, 0, IDS_TASK_MANAGER_PRERENDER_PREFIX}, - {0, 0, 0, 0, 1, 0, IDS_TASK_MANAGER_INSTANT_OVERLAY_PREFIX}, - {0, 0, 1, 0, 0, 0, IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX}, - {0, 0, 0, 0, 0, 0, IDS_TASK_MANAGER_TAB_PREFIX}}; + {1, 0, 0, 0, 1, IDS_TASK_MANAGER_BACKGROUND_PREFIX}, + {1, 0, 1, 0, 0, IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX}, + {1, 0, 0, 0, 0, IDS_TASK_MANAGER_APP_PREFIX}, + {0, 1, 1, 0, 0, IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX}, + {0, 1, 0, 0, 0, IDS_TASK_MANAGER_EXTENSION_PREFIX}, + {0, 0, 0, 1, 0, IDS_TASK_MANAGER_PRERENDER_PREFIX}, + {0, 0, 1, 0, 0, IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX}, + {0, 0, 0, 0, 0, IDS_TASK_MANAGER_TAB_PREFIX}}; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(configs); ++i) { EXPECT_EQ(configs[i].expected_result, GetMessagePrefixID(configs[i].is_app, configs[i].is_extension, configs[i].is_incognito, configs[i].is_prerender, - configs[i].is_instant_overlay, configs[i].is_background)); } } |