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

Side by Side Diff: chrome/browser/ui/ash/launcher/browser_status_monitor.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
OLDNEW
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // A shortcut to call the ChromeLauncherController's UpdateAppState(). 50 // A shortcut to call the ChromeLauncherController's UpdateAppState().
51 void UpdateAppItemState(content::WebContents* contents, 51 void UpdateAppItemState(content::WebContents* contents,
52 ChromeLauncherController::AppState app_state); 52 ChromeLauncherController::AppState app_state);
53 53
54 // A shortcut to call the BrowserShortcutLauncherItemController's 54 // A shortcut to call the BrowserShortcutLauncherItemController's
55 // UpdateBrowserItemState(). 55 // UpdateBrowserItemState().
56 void UpdateBrowserItemState(); 56 void UpdateBrowserItemState();
57 57
58 // aura::client::ActivationChangeObserver overrides: 58 // aura::client::ActivationChangeObserver overrides:
59 virtual void OnWindowActivated(aura::Window* gained_active, 59 virtual void OnWindowActivated(aura::Window* gained_active,
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 OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; 70 virtual void OnDisplayAdded(const gfx::Display& new_display) override;
71 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, 72 virtual void OnDisplayMetricsChanged(const gfx::Display& display,
73 uint32_t metrics) OVERRIDE; 73 uint32_t metrics) override;
74 74
75 // TabStripModelObserver overrides: 75 // TabStripModelObserver overrides:
76 virtual void ActiveTabChanged(content::WebContents* old_contents, 76 virtual void ActiveTabChanged(content::WebContents* old_contents,
77 content::WebContents* new_contents, 77 content::WebContents* new_contents,
78 int index, 78 int index,
79 int reason) OVERRIDE; 79 int reason) override;
80 virtual void TabReplacedAt(TabStripModel* tab_strip_model, 80 virtual void TabReplacedAt(TabStripModel* tab_strip_model,
81 content::WebContents* old_contents, 81 content::WebContents* old_contents,
82 content::WebContents* new_contents, 82 content::WebContents* new_contents,
83 int index) OVERRIDE; 83 int index) override;
84 virtual void TabInsertedAt(content::WebContents* contents, 84 virtual void TabInsertedAt(content::WebContents* contents,
85 int index, 85 int index,
86 bool foreground) OVERRIDE; 86 bool foreground) override;
87 virtual void TabClosingAt(TabStripModel* tab_strip_mode, 87 virtual void TabClosingAt(TabStripModel* tab_strip_mode,
88 content::WebContents* contents, 88 content::WebContents* contents,
89 int index) OVERRIDE; 89 int index) override;
90 90
91 // Called from our own |LocalWebContentsObserver| when web contents did go 91 // Called from our own |LocalWebContentsObserver| when web contents did go
92 // away without any other notification. This might happen in case of 92 // away without any other notification. This might happen in case of
93 // application uninstalls, page crashes, ...). 93 // application uninstalls, page crashes, ...).
94 void WebContentsDestroyed(content::WebContents* web_contents); 94 void WebContentsDestroyed(content::WebContents* web_contents);
95 95
96 protected: 96 protected:
97 // Add a V1 application to the shelf. This can get overwritten for multi 97 // Add a V1 application to the shelf. This can get overwritten for multi
98 // profile implementations. 98 // profile implementations.
99 virtual void AddV1AppToShelf(Browser* browser); 99 virtual void AddV1AppToShelf(Browser* browser);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_; 136 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_;
137 137
138 BrowserToAppIDMap browser_to_app_id_map_; 138 BrowserToAppIDMap browser_to_app_id_map_;
139 WebContentsToObserverMap webcontents_to_observer_map_; 139 WebContentsToObserverMap webcontents_to_observer_map_;
140 scoped_ptr<SettingsWindowObserver> settings_window_observer_; 140 scoped_ptr<SettingsWindowObserver> settings_window_observer_;
141 141
142 DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor); 142 DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor);
143 }; 143 };
144 144
145 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ 145 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698