OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ |
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ | 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 aura::Window* lost_active) OVERRIDE; | 60 aura::Window* lost_active) OVERRIDE; |
61 | 61 |
62 // aura::WindowObserver overrides: | 62 // aura::WindowObserver overrides: |
63 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; | 63 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; |
64 | 64 |
65 // chrome::BrowserListObserver overrides: | 65 // chrome::BrowserListObserver overrides: |
66 virtual void OnBrowserAdded(Browser* browser) OVERRIDE; | 66 virtual void OnBrowserAdded(Browser* browser) OVERRIDE; |
67 virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; | 67 virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; |
68 | 68 |
69 // gfx::DisplayObserver overrides: | 69 // gfx::DisplayObserver overrides: |
70 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; | |
71 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; | 70 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; |
72 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; | 71 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; |
| 72 virtual void OnDisplayMetricsChanged(const gfx::Display& display, |
| 73 uint32_t metrics) OVERRIDE; |
73 | 74 |
74 // TabStripModelObserver overrides: | 75 // TabStripModelObserver overrides: |
75 virtual void ActiveTabChanged(content::WebContents* old_contents, | 76 virtual void ActiveTabChanged(content::WebContents* old_contents, |
76 content::WebContents* new_contents, | 77 content::WebContents* new_contents, |
77 int index, | 78 int index, |
78 int reason) OVERRIDE; | 79 int reason) OVERRIDE; |
79 virtual void TabReplacedAt(TabStripModel* tab_strip_model, | 80 virtual void TabReplacedAt(TabStripModel* tab_strip_model, |
80 content::WebContents* old_contents, | 81 content::WebContents* old_contents, |
81 content::WebContents* new_contents, | 82 content::WebContents* new_contents, |
82 int index) OVERRIDE; | 83 int index) OVERRIDE; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_; | 136 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_; |
136 | 137 |
137 BrowserToAppIDMap browser_to_app_id_map_; | 138 BrowserToAppIDMap browser_to_app_id_map_; |
138 WebContentsToObserverMap webcontents_to_observer_map_; | 139 WebContentsToObserverMap webcontents_to_observer_map_; |
139 scoped_ptr<SettingsWindowObserver> settings_window_observer_; | 140 scoped_ptr<SettingsWindowObserver> settings_window_observer_; |
140 | 141 |
141 DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor); | 142 DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor); |
142 }; | 143 }; |
143 | 144 |
144 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ | 145 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ |
OLD | NEW |