diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-12 05:30:51 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-12 05:30:51 +0000 |
| commit | 36b36ea8e8925bb70fb92394a6cd308ffa924c05 (patch) | |
| tree | 7fa4b05f60c9b04d9dd2222f2839ad5df67004cc /chrome/browser/task_manager | |
| parent | 9b6a672924cc60a8702b3a82fb096c50a7418001 (diff) | |
| download | chromium_src-36b36ea8e8925bb70fb92394a6cd308ffa924c05.zip chromium_src-36b36ea8e8925bb70fb92394a6cd308ffa924c05.tar.gz chromium_src-36b36ea8e8925bb70fb92394a6cd308ffa924c05.tar.bz2 | |
Revert 244407 "InstantExtended: remove dead code related to the ..."
InstantPolicyTest.NoThemeBackgroundChangeEventOnTabSwitch and others
failing on XP, Mac 10.6, Linux ASAN.
> InstantExtended: remove dead code related to the non-cacheable NTP.
>
> BUG=none
>
> Review URL: https://codereview.chromium.org/132733002
TBR=samarth@chromium.org
Review URL: https://codereview.chromium.org/135903002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
6 files changed, 32 insertions, 9 deletions
diff --git a/chrome/browser/task_manager/extension_process_resource_provider.cc b/chrome/browser/task_manager/extension_process_resource_provider.cc index 570061a..1db73a1 100644 --- a/chrome/browser/task_manager/extension_process_resource_provider.cc +++ b/chrome/browser/task_manager/extension_process_resource_provider.cc @@ -98,6 +98,7 @@ 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 8f65207..18ea3b5 100644 --- a/chrome/browser/task_manager/panel_resource_provider.cc +++ b/chrome/browser/task_manager/panel_resource_provider.cc @@ -62,6 +62,7 @@ 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 af7115d..8bf392a 100644 --- a/chrome/browser/task_manager/tab_contents_resource_provider.cc +++ b/chrome/browser/task_manager/tab_contents_resource_provider.cc @@ -13,6 +13,8 @@ #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" @@ -87,6 +89,7 @@ class TabContentsResource : public RendererResource { static gfx::ImageSkia* prerender_icon_; content::WebContents* web_contents_; Profile* profile_; + bool is_instant_ntp_; DISALLOW_COPY_AND_ASSIGN(TabContentsResource); }; @@ -98,7 +101,8 @@ TabContentsResource::TabContentsResource( : RendererResource(web_contents->GetRenderProcessHost()->GetHandle(), web_contents->GetRenderViewHost()), web_contents_(web_contents), - profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())) { + profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())), + is_instant_ntp_(chrome::IsPreloadedInstantExtendedNTP(web_contents)) { if (!prerender_icon_) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); prerender_icon_ = rb.GetImageSkiaNamed(IDR_PRERENDER); @@ -134,6 +138,7 @@ 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); } @@ -232,6 +237,14 @@ 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 = @@ -287,6 +300,7 @@ 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 b755e12..d584f90 100644 --- a/chrome/browser/task_manager/task_manager_util.cc +++ b/chrome/browser/task_manager/task_manager_util.cc @@ -23,6 +23,7 @@ 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) @@ -38,6 +39,8 @@ 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 409043b..1b95c16 100644 --- a/chrome/browser/task_manager/task_manager_util.h +++ b/chrome/browser/task_manager/task_manager_util.h @@ -24,6 +24,7 @@ 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 a1f9ccf..1949df5 100644 --- a/chrome/browser/task_manager/task_manager_util_unittest.cc +++ b/chrome/browser/task_manager/task_manager_util_unittest.cc @@ -18,25 +18,28 @@ 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, 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}}; + {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}}; 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)); } } |