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

Unified Diff: chrome/browser/ui/ash/launcher/browser_status_monitor.h

Issue 1400823003: Creates BrowserTabStripTracker to consolidate common code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback and git cl format Created 5 years, 2 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/memory/tab_manager.cc ('k') | chrome/browser/ui/ash/launcher/browser_status_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/browser_status_monitor.h
diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.h b/chrome/browser/ui/ash/launcher/browser_status_monitor.h
index e7671bae4dd48ff034194170376711dd0d3a4023..1f6348813570df84ddd2d2834bc5d64eccb8737b 100644
--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.h
+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.h
@@ -14,6 +14,8 @@
#include "base/scoped_observer.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/browser_list_observer.h"
+#include "chrome/browser/ui/browser_tab_strip_tracker.h"
+#include "chrome/browser/ui/browser_tab_strip_tracker_delegate.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "ui/aura/window_observer.h"
#include "ui/gfx/display_observer.h"
@@ -34,6 +36,7 @@ class Browser;
// active tab changes.
class BrowserStatusMonitor : public aura::client::ActivationChangeObserver,
public aura::WindowObserver,
+ public BrowserTabStripTrackerDelegate,
public chrome::BrowserListObserver,
public gfx::DisplayObserver,
public TabStripModelObserver {
@@ -64,6 +67,9 @@ class BrowserStatusMonitor : public aura::client::ActivationChangeObserver,
// aura::WindowObserver overrides:
void OnWindowDestroyed(aura::Window* window) override;
+ // BrowserTabStripTrackerDelegate overrides:
+ bool ShouldTrackBrowser(Browser* browser) override;
+
// chrome::BrowserListObserver overrides:
void OnBrowserAdded(Browser* browser) override;
void OnBrowserRemoved(Browser* browser) override;
@@ -141,6 +147,8 @@ class BrowserStatusMonitor : public aura::client::ActivationChangeObserver,
WebContentsToObserverMap webcontents_to_observer_map_;
scoped_ptr<SettingsWindowObserver> settings_window_observer_;
+ BrowserTabStripTracker browser_tab_strip_tracker_;
+
DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor);
};
« no previous file with comments | « chrome/browser/memory/tab_manager.cc ('k') | chrome/browser/ui/ash/launcher/browser_status_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698