Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Unified Diff: trunk/src/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc

Issue 135903002: Revert 244407 "InstantExtended: remove dead code related to the ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/browser/ui/search/search_tab_helper.cc ('k') | trunk/src/chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
===================================================================
--- trunk/src/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc (revision 244428)
+++ trunk/src/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc (working copy)
@@ -20,9 +20,12 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/renderer_host/chrome_render_message_filter.h"
+#include "chrome/browser/search/instant_service.h"
+#include "chrome/browser/search/instant_service_factory.h"
#include "chrome/browser/ui/android/tab_model/tab_model.h"
#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_instant_controller.h"
#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
#include "chrome/browser/ui/webui/memory_internals/memory_internals_handler.h"
@@ -106,6 +109,13 @@
prerender_manager->GetAllPrerenderingContents();
web_contents->insert(contentses.begin(), contentses.end());
}
+ // 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())
+ web_contents->insert(instant_service->GetNTPContents());
+ }
#if defined(ENABLE_FULL_PRINTING)
// Add all the pages being background printed.
printing::BackgroundPrintingManager* printing_manager =
« no previous file with comments | « trunk/src/chrome/browser/ui/search/search_tab_helper.cc ('k') | trunk/src/chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698