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

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

Issue 1996563002: Add ImeMenuTray element. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove kStatusTrayShelfID. Created 4 years, 5 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 #include "ash/test/test_system_tray_delegate.h" 5 #include "ash/test/test_system_tray_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/common/session/session_state_delegate.h" 9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 base::TimeDelta* session_length_limit) { 103 base::TimeDelta* session_length_limit) {
104 if (session_length_limit_set_) 104 if (session_length_limit_set_)
105 *session_length_limit = session_length_limit_; 105 *session_length_limit = session_length_limit_;
106 return session_length_limit_set_; 106 return session_length_limit_set_;
107 } 107 }
108 108
109 void TestSystemTrayDelegate::SignOut() { 109 void TestSystemTrayDelegate::SignOut() {
110 base::MessageLoop::current()->QuitWhenIdle(); 110 base::MessageLoop::current()->QuitWhenIdle();
111 } 111 }
112 112
113 void TestSystemTrayDelegate::GetCurrentIME(IMEInfo* info) {
114 info->id = current_ime_.id;
115 info->name = current_ime_.name;
116 info->medium_name = current_ime_.medium_name;
117 info->short_name = current_ime_.short_name;
118 info->third_party = current_ime_.third_party;
119 }
120
121 void TestSystemTrayDelegate::SetCurrentIME(IMEInfo info) {
122 current_ime_ = info;
123 }
124
113 } // namespace test 125 } // namespace test
114 } // namespace ash 126 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698