summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tabs
diff options
context:
space:
mode:
authorgspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-24 23:33:11 +0000
committergspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-24 23:33:11 +0000
commit5ac2016d3695d469206aad51f04c211a84f1d32f (patch)
treeacadf43dca3c6d459ddc552926b884b92f9b8e7e /chrome/browser/tabs
parent558987967dfbaf67b7313ab0ee6482db27660717 (diff)
downloadchromium_src-5ac2016d3695d469206aad51f04c211a84f1d32f.zip
chromium_src-5ac2016d3695d469206aad51f04c211a84f1d32f.tar.gz
chromium_src-5ac2016d3695d469206aad51f04c211a84f1d32f.tar.bz2
This is another try to commit OOM priority management.
This changes nothing, except that I now initialize memory_used in oom_priority_manager.cc to placate the incorrect gcc warning about it being used when uninitialized. The original review is here: http://codereview.chromium.org/4498001/ BUG=none TEST=Passed chromeos try-bot, built both debug and release locally. Review URL: http://codereview.chromium.org/5328003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r--chrome/browser/tabs/tab_strip_model.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index 51582ad..1a9ac8f 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -477,6 +477,7 @@ void TabStripModel::SetTabPinned(int index, bool pinned) {
}
bool TabStripModel::IsTabPinned(int index) const {
+ DCHECK(ContainsIndex(index));
return contents_data_[index]->pinned;
}
@@ -961,7 +962,8 @@ void TabStripModel::ChangeSelectedContentsFrom(
ObserverListBase<TabStripModelObserver>::Iterator it(observers_);
TabStripModelObserver* obs;
while ((obs = it.GetNext()) != NULL)
- obs->TabSelectedAt(last_selected_contents, new_contents, selected_index_, user_gesture);
+ obs->TabSelectedAt(last_selected_contents, new_contents,
+ selected_index_, user_gesture);
/*
FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
TabSelectedAt(last_selected_contents, new_contents, selected_index_,