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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 790503002: Methods and types rename for child accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years 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_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/session/session_state_observer.h" 10 #include "ash/session/session_state_observer.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( 129 ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
130 const std::string& user_id) override; 130 const std::string& user_id) override;
131 void AddCustodianInfoTrayObserver( 131 void AddCustodianInfoTrayObserver(
132 ash::CustodianInfoTrayObserver* observer) override; 132 ash::CustodianInfoTrayObserver* observer) override;
133 void RemoveCustodianInfoTrayObserver( 133 void RemoveCustodianInfoTrayObserver(
134 ash::CustodianInfoTrayObserver* observer) override; 134 ash::CustodianInfoTrayObserver* observer) override;
135 135
136 // Overridden from user_manager::UserManager::UserSessionStateObserver: 136 // Overridden from user_manager::UserManager::UserSessionStateObserver:
137 void UserAddedToSession(const user_manager::User* active_user) override; 137 void UserAddedToSession(const user_manager::User* active_user) override;
138 138
139 void UserChangedSupervisedStatus(user_manager::User* user) override; 139 void UserChangedChildStatus(user_manager::User* user) override;
140 140
141 // browser tests need to call ShouldUse24HourClock(). 141 // browser tests need to call ShouldUse24HourClock().
142 bool GetShouldUse24HourClockForTesting() const; 142 bool GetShouldUse24HourClockForTesting() const;
143 143
144 private: 144 private:
145 // Should be the same as CrosSettings::ObserverSubscription. 145 // Should be the same as CrosSettings::ObserverSubscription.
146 typedef base::CallbackList<void(void)>::Subscription 146 typedef base::CallbackList<void(void)>::Subscription
147 CrosSettingsObserverSubscription; 147 CrosSettingsObserverSubscription;
148 148
149 ash::SystemTray* GetPrimarySystemTray(); 149 ash::SystemTray* GetPrimarySystemTray();
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 279 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
280 280
281 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 281 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
282 }; 282 };
283 283
284 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 284 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
285 285
286 } // namespace chromeos 286 } // namespace chromeos
287 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 287 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698