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

Side by Side Diff: ash/system/tray/system_tray_delegate.h

Issue 627593003: Adding infrastructure for possibility of changing manager names for the supervised accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Weak pointers removed. 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 ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/system/user/login_status.h" 12 #include "ash/system/user/login_status.h"
13 #include "base/callback_forward.h"
13 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
14 #include "base/i18n/time_formatting.h" 15 #include "base/i18n/time_formatting.h"
15 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
16 #include "base/strings/string16.h" 17 #include "base/strings/string16.h"
17 #include "ui/gfx/image/image_skia.h" 18 #include "ui/gfx/image/image_skia.h"
18 19
19 namespace base { 20 namespace base {
20 class TimeDelta; 21 class TimeDelta;
21 class TimeTicks; 22 class TimeTicks;
22 } 23 }
23 24
24 namespace ash { 25 namespace ash {
25 26
27 class CustodianInfoTrayObserver;
28
26 struct ASH_EXPORT NetworkIconInfo { 29 struct ASH_EXPORT NetworkIconInfo {
27 NetworkIconInfo(); 30 NetworkIconInfo();
28 ~NetworkIconInfo(); 31 ~NetworkIconInfo();
29 32
30 bool highlight() const { return connected || connecting; } 33 bool highlight() const { return connected || connecting; }
31 34
32 bool connecting; 35 bool connecting;
33 bool connected; 36 bool connected;
34 bool tray_icon_visible; 37 bool tray_icon_visible;
35 gfx::ImageSkia image; 38 gfx::ImageSkia image;
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 // to be switched to the new user. 291 // to be switched to the new user.
289 // Note: This will happen after SessionStateObserver::ActiveUserChanged fires. 292 // Note: This will happen after SessionStateObserver::ActiveUserChanged fires.
290 virtual void ActiveUserWasChanged() = 0; 293 virtual void ActiveUserWasChanged() = 0;
291 294
292 // Returns true when the Search key is configured to be treated as Caps Lock. 295 // Returns true when the Search key is configured to be treated as Caps Lock.
293 virtual bool IsSearchKeyMappedToCapsLock() = 0; 296 virtual bool IsSearchKeyMappedToCapsLock() = 0;
294 297
295 // Returns accounts delegate for given user. 298 // Returns accounts delegate for given user.
296 virtual tray::UserAccountsDelegate* GetUserAccountsDelegate( 299 virtual tray::UserAccountsDelegate* GetUserAccountsDelegate(
297 const std::string& user_id) = 0; 300 const std::string& user_id) = 0;
301
302 // Adding observers that are notified when supervised info is being changed.
303 virtual void AddObserver(CustodianInfoTrayObserver* observer) {
Daniel Erat 2014/10/07 16:16:00 any reason these aren't abstract like all the othe
merkulova 2014/10/08 09:19:37 I don't want to clutter default_system_tray_delega
304 };
305
306 virtual void RemoveObserver(CustodianInfoTrayObserver* observer) {
307 };
298 }; 308 };
299 309
300 } // namespace ash 310 } // namespace ash
301 311
302 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 312 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698