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

Side by Side Diff: chrome/browser/chromeos/input_method/mock_input_method_manager.cc

Issue 150723006: Make input_methods.txt to be able to specify indicator string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more consistent Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/input_method/mock_input_method_manager.h" 5 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
6 6
7 namespace chromeos { 7 namespace chromeos {
8 namespace input_method { 8 namespace input_method {
9 9
10 MockInputMethodManager::MockInputMethodManager() 10 MockInputMethodManager::MockInputMethodManager()
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 const ui::Accelerator& accelerator) { 127 const ui::Accelerator& accelerator) {
128 return true; 128 return true;
129 } 129 }
130 130
131 InputMethodDescriptor MockInputMethodManager::GetCurrentInputMethod() const { 131 InputMethodDescriptor MockInputMethodManager::GetCurrentInputMethod() const {
132 InputMethodDescriptor descriptor = 132 InputMethodDescriptor descriptor =
133 InputMethodUtil::GetFallbackInputMethodDescriptor(); 133 InputMethodUtil::GetFallbackInputMethodDescriptor();
134 if (!current_input_method_id_.empty()) { 134 if (!current_input_method_id_.empty()) {
135 return InputMethodDescriptor(current_input_method_id_, 135 return InputMethodDescriptor(current_input_method_id_,
136 descriptor.name(), 136 descriptor.name(),
137 descriptor.indicator(),
137 descriptor.keyboard_layouts(), 138 descriptor.keyboard_layouts(),
138 descriptor.language_codes(), 139 descriptor.language_codes(),
139 true, 140 true,
140 GURL(), // options page url. 141 GURL(), // options page url.
141 GURL()); // input view page url. 142 GURL()); // input view page url.
142 } 143 }
143 return descriptor; 144 return descriptor;
144 } 145 }
145 146
146 InputMethodPropertyList 147 InputMethodPropertyList
(...skipping 26 matching lines...) Expand all
173 const std::string& value) { 174 const std::string& value) {
174 delegate_.set_hardware_keyboard_layout(value); 175 delegate_.set_hardware_keyboard_layout(value);
175 } 176 }
176 177
177 bool MockInputMethodManager::IsLoginKeyboard( 178 bool MockInputMethodManager::IsLoginKeyboard(
178 const std::string& layout) const { 179 const std::string& layout) const {
179 return true; 180 return true;
180 } 181 }
181 } // namespace input_method 182 } // namespace input_method
182 } // namespace chromeos 183 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698