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

Unified Diff: chrome/browser/chromeos/memory/oom_priority_manager.cc

Issue 12213075: Swap deprecated BrowserList:: iterators for BrowserIterator in non-Windows code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r181832 Created 7 years, 10 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
Index: chrome/browser/chromeos/memory/oom_priority_manager.cc
diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.cc b/chrome/browser/chromeos/memory/oom_priority_manager.cc
index 6cae3eac03a184982485c69896bf5096af35d02f..cb15d979bb8bfca2bd872c009595cacd86dfc162 100644
--- a/chrome/browser/chromeos/memory/oom_priority_manager.cc
+++ b/chrome/browser/chromeos/memory/oom_priority_manager.cc
@@ -27,6 +27,7 @@
#include "chrome/browser/chromeos/memory/low_memory_observer.h"
#include "chrome/browser/memory_details.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -265,9 +266,8 @@ bool OomPriorityManager::IsReloadableUI(const GURL& url) {
}
bool OomPriorityManager::DiscardTabById(int64 target_web_contents_id) {
- for (BrowserList::const_iterator browser_iterator = BrowserList::begin();
- browser_iterator != BrowserList::end(); ++browser_iterator) {
- Browser* browser = *browser_iterator;
+ for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+ Browser* browser = *it;
TabStripModel* model = browser->tab_strip_model();
for (int idx = 0; idx < model->count(); idx++) {
// Can't discard tabs that are already discarded or active.
@@ -362,11 +362,8 @@ void OomPriorityManager::PurgeBrowserMemory() {
int OomPriorityManager::GetTabCount() const {
int tab_count = 0;
- for (BrowserList::const_iterator browser_it = BrowserList::begin();
- browser_it != BrowserList::end(); ++browser_it) {
- Browser* browser = *browser_it;
- tab_count += browser->tab_strip_model()->count();
- }
+ for (chrome::BrowserIterator it; !it.done(); it.Next())
+ tab_count += it->tab_strip_model()->count();
return tab_count;
}
« no previous file with comments | « chrome/browser/chromeos/media/media_player_browsertest.cc ('k') | chrome/browser/download/download_status_updater_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698