| 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 0ef56518e8720eea88ad8f77949be0e64bc66ab2..7fd0f4592ba4393a39c63f999cafb65733768140 100644
|
| --- a/chrome/browser/ui/ash/launcher/browser_status_monitor.h
|
| +++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.h
|
| @@ -100,10 +100,6 @@ class BrowserStatusMonitor : public aura::client::ActivationChangeObserver,
|
| class LocalWebContentsObserver;
|
| class SettingsWindowObserver;
|
|
|
| - typedef std::map<Browser*, std::string> BrowserToAppIDMap;
|
| - typedef std::map<content::WebContents*, LocalWebContentsObserver*>
|
| - WebContentsToObserverMap;
|
| -
|
| // Create LocalWebContentsObserver for |contents|.
|
| void AddWebContentsObserver(content::WebContents* contents);
|
|
|
| @@ -119,8 +115,9 @@ class BrowserStatusMonitor : public aura::client::ActivationChangeObserver,
|
|
|
| ChromeLauncherController* launcher_controller_;
|
|
|
| - BrowserToAppIDMap browser_to_app_id_map_;
|
| - WebContentsToObserverMap webcontents_to_observer_map_;
|
| + std::map<Browser*, std::string> browser_to_app_id_map_;
|
| + std::map<content::WebContents*, std::unique_ptr<LocalWebContentsObserver>>
|
| + webcontents_to_observer_map_;
|
| std::unique_ptr<SettingsWindowObserver> settings_window_observer_;
|
|
|
| BrowserTabStripTracker browser_tab_strip_tracker_;
|
|
|