| Index: chrome/browser/memory/tab_manager.cc
|
| diff --git a/chrome/browser/memory/tab_manager.cc b/chrome/browser/memory/tab_manager.cc
|
| index 3527bbd151737d3612c3dfc67e2c8a22532566de..cd75f1f49ce70736036849c44e958beff9042c7e 100644
|
| --- a/chrome/browser/memory/tab_manager.cc
|
| +++ b/chrome/browser/memory/tab_manager.cc
|
| @@ -101,19 +101,19 @@ int FindTabStripModelById(int64 target_web_contents_id, TabStripModel** model) {
|
| // TabManager
|
|
|
| TabManager::TabManager()
|
| - : discard_count_(0), recent_tab_discard_(false), discard_once_(false) {
|
| + : discard_count_(0),
|
| + recent_tab_discard_(false),
|
| + discard_once_(false),
|
| + browser_tab_strip_tracker_(this, nullptr, nullptr) {
|
| #if defined(OS_CHROMEOS)
|
| delegate_.reset(new TabManagerDelegate);
|
| #endif
|
| - BrowserList::AddObserver(this);
|
| + browser_tab_strip_tracker_.Init(
|
| + BrowserTabStripTracker::InitWith::ALL_BROWERS);
|
| }
|
|
|
| TabManager::~TabManager() {
|
| Stop();
|
| - for (chrome::BrowserIterator iterator; !iterator.done(); iterator.Next())
|
| - iterator->tab_strip_model()->RemoveObserver(this);
|
| -
|
| - BrowserList::RemoveObserver(this);
|
| }
|
|
|
| void TabManager::Start(bool discard_once) {
|
| @@ -475,14 +475,6 @@ void TabManager::OnMemoryPressure(
|
| // consider to call PurgeBrowserMemory() before CRITICAL is reached.
|
| }
|
|
|
| -void TabManager::OnBrowserAdded(Browser* browser) {
|
| - browser->tab_strip_model()->AddObserver(this);
|
| -}
|
| -
|
| -void TabManager::OnBrowserRemoved(Browser* browser) {
|
| - browser->tab_strip_model()->RemoveObserver(this);
|
| -}
|
| -
|
| bool TabManager::IsAudioTab(WebContents* contents) const {
|
| if (contents->WasRecentlyAudible())
|
| return true;
|
|
|