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 #include "chromeos/ime/input_method_descriptor.h" | 5 #include "chromeos/ime/input_method_descriptor.h" |
6 | 6 |
7 #include <sstream> | 7 #include <sstream> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
11 #include "url/gurl.h" | 11 #include "url/gurl.h" |
12 | 12 |
13 namespace chromeos { | 13 namespace chromeos { |
14 namespace input_method { | 14 namespace input_method { |
15 | 15 |
16 InputMethodDescriptor::InputMethodDescriptor( | 16 InputMethodDescriptor::InputMethodDescriptor( |
17 const std::string& id, | 17 const std::string& id, |
18 const std::string& name, | 18 const std::string& name, |
| 19 const std::string& indicator, |
19 const std::vector<std::string>& keyboard_layouts, | 20 const std::vector<std::string>& keyboard_layouts, |
20 const std::vector<std::string>& language_codes, | 21 const std::vector<std::string>& language_codes, |
21 bool is_login_keyboard, | 22 bool is_login_keyboard, |
22 const GURL& options_page_url, | 23 const GURL& options_page_url, |
23 const GURL& input_view_url) | 24 const GURL& input_view_url) |
24 : id_(id), | 25 : id_(id), |
25 name_(name), | 26 name_(name), |
26 keyboard_layouts_(keyboard_layouts), | 27 keyboard_layouts_(keyboard_layouts), |
27 language_codes_(language_codes), | 28 language_codes_(language_codes), |
| 29 indicator_(indicator), |
28 is_login_keyboard_(is_login_keyboard), | 30 is_login_keyboard_(is_login_keyboard), |
29 options_page_url_(options_page_url), | 31 options_page_url_(options_page_url), |
30 input_view_url_(input_view_url) { | 32 input_view_url_(input_view_url) { |
31 } | 33 } |
32 | 34 |
33 std::string InputMethodDescriptor::GetPreferredKeyboardLayout() const { | 35 std::string InputMethodDescriptor::GetPreferredKeyboardLayout() const { |
34 // TODO(nona): Investigate better way to guess the preferred layout | 36 // TODO(nona): Investigate better way to guess the preferred layout |
35 // http://crbug.com/170601. | 37 // http://crbug.com/170601. |
36 return keyboard_layouts_.empty() ? "us" : keyboard_layouts_[0]; | 38 return keyboard_layouts_.empty() ? "us" : keyboard_layouts_[0]; |
37 } | 39 } |
38 | 40 |
39 InputMethodDescriptor::InputMethodDescriptor() { | 41 InputMethodDescriptor::InputMethodDescriptor() { |
40 } | 42 } |
41 | 43 |
42 InputMethodDescriptor::~InputMethodDescriptor() { | 44 InputMethodDescriptor::~InputMethodDescriptor() { |
43 } | 45 } |
44 | 46 |
45 } // namespace input_method | 47 } // namespace input_method |
46 } // namespace chromeos | 48 } // namespace chromeos |
OLD | NEW |