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

Side by Side Diff: ash/common/test/test_system_tray_delegate.h

Issue 2568413002: Revert of ash: Use system tray mojo interface to show system update tray icon (Closed)
Patch Set: Created 4 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 ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include "ash/common/system/tray/default_system_tray_delegate.h" 8 #include "ash/common/system/tray/default_system_tray_delegate.h"
9 #include "ash/common/system/tray/ime_info.h" 9 #include "ash/common/system/tray/ime_info.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 23 matching lines...) Expand all
34 34
35 // Sets the IME info. 35 // Sets the IME info.
36 void SetCurrentIME(const IMEInfo& info); 36 void SetCurrentIME(const IMEInfo& info);
37 37
38 // Sets the list of available IMEs. 38 // Sets the list of available IMEs.
39 void SetAvailableIMEList(const IMEInfoList& list); 39 void SetAvailableIMEList(const IMEInfoList& list);
40 40
41 // Overridden from SystemTrayDelegate: 41 // Overridden from SystemTrayDelegate:
42 LoginStatus GetUserLoginStatus() const override; 42 LoginStatus GetUserLoginStatus() const override;
43 bool IsUserSupervised() const override; 43 bool IsUserSupervised() const override;
44 void GetSystemUpdateInfo(UpdateInfo* info) const override;
44 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 45 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
45 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 46 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
46 void GetCurrentIME(IMEInfo* info) override; 47 void GetCurrentIME(IMEInfo* info) override;
47 void GetAvailableIMEList(IMEInfoList* list) override; 48 void GetAvailableIMEList(IMEInfoList* list) override;
48 49
49 private: 50 private:
50 LoginStatus login_status_; 51 LoginStatus login_status_;
51 base::TimeDelta session_length_limit_; 52 base::TimeDelta session_length_limit_;
52 bool session_length_limit_set_; 53 bool session_length_limit_set_;
53 IMEInfo current_ime_; 54 IMEInfo current_ime_;
(...skipping 13 matching lines...) Expand all
67 private: 68 private:
68 LoginStatus old_status_; 69 LoginStatus old_status_;
69 70
70 DISALLOW_COPY_AND_ASSIGN(ScopedInitialLoginStatus); 71 DISALLOW_COPY_AND_ASSIGN(ScopedInitialLoginStatus);
71 }; 72 };
72 73
73 } // namespace test 74 } // namespace test
74 } // namespace ash 75 } // namespace ash
75 76
76 #endif // ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 77 #endif // ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/common/system/update/update_observer.h ('k') | ash/common/test/test_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698