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

Side by Side Diff: chrome/browser/ui/ash/launcher/app_window_launcher_controller.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_APP_WINDOW_LAUNCHER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 // Called by ChromeLauncherController when the active user changed and the 44 // Called by ChromeLauncherController when the active user changed and the
45 // items need to be updated. 45 // items need to be updated.
46 virtual void ActiveUserChanged(const std::string& user_email) {} 46 virtual void ActiveUserChanged(const std::string& user_email) {}
47 47
48 // An additional user identified by |Profile|, got added to the existing 48 // An additional user identified by |Profile|, got added to the existing
49 // session. 49 // session.
50 virtual void AdditionalUserAddedToSession(Profile* profile); 50 virtual void AdditionalUserAddedToSession(Profile* profile);
51 51
52 // Overridden from AppWindowRegistry::Observer: 52 // Overridden from AppWindowRegistry::Observer:
53 virtual void OnAppWindowIconChanged( 53 virtual void OnAppWindowIconChanged(
54 extensions::AppWindow* app_window) OVERRIDE; 54 extensions::AppWindow* app_window) override;
55 virtual void OnAppWindowShown(extensions::AppWindow* app_window) OVERRIDE; 55 virtual void OnAppWindowShown(extensions::AppWindow* app_window) override;
56 virtual void OnAppWindowHidden(extensions::AppWindow* app_window) OVERRIDE; 56 virtual void OnAppWindowHidden(extensions::AppWindow* app_window) override;
57 57
58 // Overriden from aura::WindowObserver: 58 // Overriden from aura::WindowObserver:
59 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 59 virtual void OnWindowDestroying(aura::Window* window) override;
60 60
61 // Overriden from client::ActivationChangeObserver: 61 // Overriden from client::ActivationChangeObserver:
62 virtual void OnWindowActivated(aura::Window* gained_active, 62 virtual void OnWindowActivated(aura::Window* gained_active,
63 aura::Window* lost_active) OVERRIDE; 63 aura::Window* lost_active) override;
64 64
65 protected: 65 protected:
66 // Registers a app window with the shelf and this object. 66 // Registers a app window with the shelf and this object.
67 void RegisterApp(extensions::AppWindow* app_window); 67 void RegisterApp(extensions::AppWindow* app_window);
68 68
69 // Unregisters a app window with the shelf and this object. 69 // Unregisters a app window with the shelf and this object.
70 void UnregisterApp(aura::Window* window); 70 void UnregisterApp(aura::Window* window);
71 71
72 // Check if a given window is known to the launcher controller. 72 // Check if a given window is known to the launcher controller.
73 bool IsRegisteredApp(aura::Window* window); 73 bool IsRegisteredApp(aura::Window* window);
(...skipping 15 matching lines...) Expand all
89 // Map of app launcher id to controller. 89 // Map of app launcher id to controller.
90 AppControllerMap app_controller_map_; 90 AppControllerMap app_controller_map_;
91 91
92 // Allows us to get from an aura::Window to the app shelf id. 92 // Allows us to get from an aura::Window to the app shelf id.
93 WindowToAppShelfIdMap window_to_app_shelf_id_map_; 93 WindowToAppShelfIdMap window_to_app_shelf_id_map_;
94 94
95 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherController); 95 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherController);
96 }; 96 };
97 97
98 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_CONTROLLER_H_ 98 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698