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

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

Issue 133013002: Remove render process and WebContents notifications from background printing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes 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 | « chrome/browser/task_manager/tab_contents_resource_provider.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
index 2c49eba8f5b6ae9e58e1b0db55f9771548cd2e0c..d30dcf871c8675f710f1250ecc0403f07a9a15a2 100644
--- a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
+++ b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
@@ -107,8 +107,7 @@ void GetAllWebContents(std::set<content::WebContents*>* web_contents) {
continue;
const std::vector<content::WebContents*> contentses =
prerender_manager->GetAllPrerenderingContents();
- for (size_t j = 0; j < contentses.size(); ++j)
- web_contents->insert(contentses[j]);
+ web_contents->insert(contentses.begin(), contentses.end());
}
// Add all the Instant Extended prerendered NTPs.
for (size_t i = 0; i < profiles.size(); ++i) {
@@ -121,11 +120,9 @@ void GetAllWebContents(std::set<content::WebContents*>* web_contents) {
// Add all the pages being background printed.
printing::BackgroundPrintingManager* printing_manager =
g_browser_process->background_printing_manager();
- for (printing::BackgroundPrintingManager::WebContentsSet::const_iterator
- iter = printing_manager->begin();
- iter != printing_manager->end(); ++iter) {
- web_contents->insert(*iter);
- }
+ std::set<content::WebContents*> printing_contents =
+ printing_manager->CurrentContentSet();
+ web_contents->insert(printing_contents.begin(), printing_contents.end());
#endif
}
« no previous file with comments | « chrome/browser/task_manager/tab_contents_resource_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698