Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ | 5 #ifndef ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ |
| 6 #define ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ | 6 #define ASH_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 "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 void ClearSessionLengthLimit(); | 48 void ClearSessionLengthLimit(); |
| 49 | 49 |
| 50 // Overridden from SystemTrayDelegate: | 50 // Overridden from SystemTrayDelegate: |
| 51 LoginStatus GetUserLoginStatus() const override; | 51 LoginStatus GetUserLoginStatus() const override; |
| 52 bool IsUserSupervised() const override; | 52 bool IsUserSupervised() const override; |
| 53 void GetSystemUpdateInfo(UpdateInfo* info) const override; | 53 void GetSystemUpdateInfo(UpdateInfo* info) const override; |
| 54 bool ShouldShowDisplayNotification() override; | 54 bool ShouldShowDisplayNotification() override; |
| 55 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; | 55 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; |
| 56 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; | 56 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; |
| 57 void SignOut() override; | 57 void SignOut() override; |
| 58 void GetCurrentIME(IMEInfo* info) override; | |
| 59 | |
| 60 void SetCurrentIME(IMEInfo info); | |
|
sadrul
2016/06/29 15:14:10
non-override before overrides.
Also, const&
Azure Wei
2016/06/30 00:36:30
Done.
| |
| 58 | 61 |
| 59 private: | 62 private: |
| 60 bool should_show_display_notification_; | 63 bool should_show_display_notification_; |
| 61 LoginStatus login_status_; | 64 LoginStatus login_status_; |
| 62 base::TimeDelta session_length_limit_; | 65 base::TimeDelta session_length_limit_; |
| 63 bool session_length_limit_set_; | 66 bool session_length_limit_set_; |
| 67 IMEInfo current_ime_; | |
| 64 | 68 |
| 65 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate); | 69 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate); |
| 66 }; | 70 }; |
| 67 | 71 |
| 68 } // namespace test | 72 } // namespace test |
| 69 } // namespace ash | 73 } // namespace ash |
| 70 | 74 |
| 71 #endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ | 75 #endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ |
| OLD | NEW |