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

Side by Side Diff: chrome/browser/profiles/avatar_menu.h

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_PROFILES_AVATAR_MENU_H_ 5 #ifndef CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
6 #define CHROME_BROWSER_PROFILES_AVATAR_MENU_H_ 6 #define CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 // Returns true if the add profile link should be shown. 143 // Returns true if the add profile link should be shown.
144 bool ShouldShowAddNewProfileLink() const; 144 bool ShouldShowAddNewProfileLink() const;
145 145
146 // Returns true if the edit profile link should be shown. 146 // Returns true if the edit profile link should be shown.
147 bool ShouldShowEditProfileLink() const; 147 bool ShouldShowEditProfileLink() const;
148 148
149 // content::NotificationObserver: 149 // content::NotificationObserver:
150 virtual void Observe(int type, 150 virtual void Observe(int type,
151 const content::NotificationSource& source, 151 const content::NotificationSource& source,
152 const content::NotificationDetails& details) OVERRIDE; 152 const content::NotificationDetails& details) override;
153 153
154 private: 154 private:
155 #if defined(ENABLE_MANAGED_USERS) 155 #if defined(ENABLE_MANAGED_USERS)
156 // SupervisedUserServiceObserver: 156 // SupervisedUserServiceObserver:
157 virtual void OnCustodianInfoChanged() OVERRIDE; 157 virtual void OnCustodianInfoChanged() override;
158 #endif 158 #endif
159 159
160 // The model that provides the list of menu items. 160 // The model that provides the list of menu items.
161 scoped_ptr<ProfileList> profile_list_; 161 scoped_ptr<ProfileList> profile_list_;
162 162
163 // The controller for avatar menu actions. 163 // The controller for avatar menu actions.
164 scoped_ptr<AvatarMenuActions> menu_actions_; 164 scoped_ptr<AvatarMenuActions> menu_actions_;
165 165
166 #if defined(ENABLE_MANAGED_USERS) 166 #if defined(ENABLE_MANAGED_USERS)
167 // Observes changes to a supervised user's custodian info. 167 // Observes changes to a supervised user's custodian info.
(...skipping 10 matching lines...) Expand all
178 // Browser in which this avatar menu resides. Weak. 178 // Browser in which this avatar menu resides. Weak.
179 Browser* browser_; 179 Browser* browser_;
180 180
181 // Listens for notifications from the ProfileInfoCache. 181 // Listens for notifications from the ProfileInfoCache.
182 content::NotificationRegistrar registrar_; 182 content::NotificationRegistrar registrar_;
183 183
184 DISALLOW_COPY_AND_ASSIGN(AvatarMenu); 184 DISALLOW_COPY_AND_ASSIGN(AvatarMenu);
185 }; 185 };
186 186
187 #endif // CHROME_BROWSER_PROFILES_AVATAR_MENU_H_ 187 #endif // CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
OLDNEW
« no previous file with comments | « chrome/browser/profile_resetter/profile_resetter_unittest.cc ('k') | chrome/browser/profiles/avatar_menu_actions_desktop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698