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

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

Issue 2277753006: Revert "Revert of Updates the IME list when the IME has refreshed. (patchset #7 id:120001 of https:… (Closed)
Patch Set: Add new test to cover the crash. Created 4 years, 3 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 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 "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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 // Updates the session length limit so that the limit will come from now in 44 // Updates the session length limit so that the limit will come from now in
45 // |new_limit|. 45 // |new_limit|.
46 void SetSessionLengthLimitForTest(const base::TimeDelta& new_limit); 46 void SetSessionLengthLimitForTest(const base::TimeDelta& new_limit);
47 47
48 // Clears the session length limit. 48 // Clears the session length limit.
49 void ClearSessionLengthLimit(); 49 void ClearSessionLengthLimit();
50 50
51 // Sets the IME info. 51 // Sets the IME info.
52 void SetCurrentIME(const IMEInfo& info); 52 void SetCurrentIME(const IMEInfo& info);
53 53
54 // Sets the list of available IMEs.
55 void SetAvailableIMEList(const IMEInfoList& list);
56
54 // Overridden from SystemTrayDelegate: 57 // Overridden from SystemTrayDelegate:
55 LoginStatus GetUserLoginStatus() const override; 58 LoginStatus GetUserLoginStatus() const override;
56 bool IsUserSupervised() const override; 59 bool IsUserSupervised() const override;
57 void GetSystemUpdateInfo(UpdateInfo* info) const override; 60 void GetSystemUpdateInfo(UpdateInfo* info) const override;
58 bool ShouldShowDisplayNotification() override; 61 bool ShouldShowDisplayNotification() override;
59 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 62 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
60 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 63 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
61 void SignOut() override; 64 void SignOut() override;
62 std::unique_ptr<SystemTrayItem> CreateDisplayTrayItem( 65 std::unique_ptr<SystemTrayItem> CreateDisplayTrayItem(
63 SystemTray* tray) override; 66 SystemTray* tray) override;
64 std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( 67 std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
65 SystemTray* tray) override; 68 SystemTray* tray) override;
66 void GetCurrentIME(IMEInfo* info) override; 69 void GetCurrentIME(IMEInfo* info) override;
70 void GetAvailableIMEList(IMEInfoList* list) override;
67 71
68 private: 72 private:
69 bool should_show_display_notification_; 73 bool should_show_display_notification_;
70 LoginStatus login_status_; 74 LoginStatus login_status_;
71 base::TimeDelta session_length_limit_; 75 base::TimeDelta session_length_limit_;
72 bool session_length_limit_set_; 76 bool session_length_limit_set_;
73 IMEInfo current_ime_; 77 IMEInfo current_ime_;
78 IMEInfoList ime_list_;
74 79
75 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate); 80 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate);
76 }; 81 };
77 82
78 } // namespace test 83 } // namespace test
79 } // namespace ash 84 } // namespace ash
80 85
81 #endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 86 #endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc ('k') | ash/test/test_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698