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

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

Issue 2281473002: Revert of Updates the IME list when the IME has refreshed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
57 // Overridden from SystemTrayDelegate: 54 // Overridden from SystemTrayDelegate:
58 LoginStatus GetUserLoginStatus() const override; 55 LoginStatus GetUserLoginStatus() const override;
59 bool IsUserSupervised() const override; 56 bool IsUserSupervised() const override;
60 void GetSystemUpdateInfo(UpdateInfo* info) const override; 57 void GetSystemUpdateInfo(UpdateInfo* info) const override;
61 bool ShouldShowDisplayNotification() override; 58 bool ShouldShowDisplayNotification() override;
62 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 59 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
63 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 60 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
64 void SignOut() override; 61 void SignOut() override;
65 std::unique_ptr<SystemTrayItem> CreateDisplayTrayItem( 62 std::unique_ptr<SystemTrayItem> CreateDisplayTrayItem(
66 SystemTray* tray) override; 63 SystemTray* tray) override;
67 std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( 64 std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
68 SystemTray* tray) override; 65 SystemTray* tray) override;
69 void GetCurrentIME(IMEInfo* info) override; 66 void GetCurrentIME(IMEInfo* info) override;
70 void GetAvailableIMEList(IMEInfoList* list) override;
71 67
72 private: 68 private:
73 bool should_show_display_notification_; 69 bool should_show_display_notification_;
74 LoginStatus login_status_; 70 LoginStatus login_status_;
75 base::TimeDelta session_length_limit_; 71 base::TimeDelta session_length_limit_;
76 bool session_length_limit_set_; 72 bool session_length_limit_set_;
77 IMEInfo current_ime_; 73 IMEInfo current_ime_;
78 IMEInfoList ime_list_;
79 74
80 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate); 75 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate);
81 }; 76 };
82 77
83 } // namespace test 78 } // namespace test
84 } // namespace ash 79 } // namespace ash
85 80
86 #endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 81 #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