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

Side by Side Diff: chromeos/ime/input_method_whitelist.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
« no previous file with comments | « chromeos/ime/input_method_descriptor.cc ('k') | chromeos/ime/input_methods.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chromeos/ime/input_method_whitelist.h" 5 #include "chromeos/ime/input_method_whitelist.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chromeos/ime/input_method_descriptor.h" 10 #include "chromeos/ime/input_method_descriptor.h"
(...skipping 26 matching lines...) Expand all
37 std::vector<std::string> layouts; 37 std::vector<std::string> layouts;
38 layouts.push_back(kInputMethods[i].xkb_layout_id); 38 layouts.push_back(kInputMethods[i].xkb_layout_id);
39 39
40 std::vector<std::string> languages; 40 std::vector<std::string> languages;
41 Tokenize(kInputMethods[i].language_code, kLanguageDelimiter, &languages); 41 Tokenize(kInputMethods[i].language_code, kLanguageDelimiter, &languages);
42 DCHECK(!languages.empty()); 42 DCHECK(!languages.empty());
43 43
44 input_methods->push_back(InputMethodDescriptor( 44 input_methods->push_back(InputMethodDescriptor(
45 kInputMethods[i].input_method_id, 45 kInputMethods[i].input_method_id,
46 "", 46 "",
47 kInputMethods[i].indicator,
47 layouts, 48 layouts,
48 languages, 49 languages,
49 kInputMethods[i].is_login_keyboard, 50 kInputMethods[i].is_login_keyboard,
50 GURL(), // options page url. 51 GURL(), // options page url.
51 GURL() // input view page url. 52 GURL() // input view page url.
52 )); 53 ));
53 } 54 }
54 return input_methods.Pass(); 55 return input_methods.Pass();
55 } 56 }
56 57
57 } // namespace input_method 58 } // namespace input_method
58 } // namespace chromeos 59 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/ime/input_method_descriptor.cc ('k') | chromeos/ime/input_methods.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698