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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.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/ui/webui/options/language_options_handler.h" 5 #include "chrome/browser/ui/webui/options/language_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 private: 71 private:
72 InputMethodDescriptor GetDesc(const std::string& id, 72 InputMethodDescriptor GetDesc(const std::string& id,
73 const std::string& raw_layout, 73 const std::string& raw_layout,
74 const std::string& language_code) { 74 const std::string& language_code) {
75 std::vector<std::string> layouts; 75 std::vector<std::string> layouts;
76 layouts.push_back(raw_layout); 76 layouts.push_back(raw_layout);
77 std::vector<std::string> languages; 77 std::vector<std::string> languages;
78 languages.push_back(language_code); 78 languages.push_back(language_code);
79 return InputMethodDescriptor( 79 return InputMethodDescriptor(
80 id, std::string(), layouts, languages, true, GURL(), GURL()); 80 id, std::string(), std::string(), layouts, languages, true,
81 GURL(), GURL());
81 } 82 }
82 }; 83 };
83 84
84 } // namespace 85 } // namespace
85 86
86 void Test__InitStartupCustomizationDocument(const std::string& manifest) { 87 void Test__InitStartupCustomizationDocument(const std::string& manifest) {
87 chromeos::StartupCustomizationDocument::GetInstance()->LoadManifestFromString( 88 chromeos::StartupCustomizationDocument::GetInstance()->LoadManifestFromString(
88 manifest); 89 manifest);
89 chromeos::StartupCustomizationDocument::GetInstance()->Init( 90 chromeos::StartupCustomizationDocument::GetInstance()->Init(
90 chromeos::system::StatisticsProvider::GetInstance()); 91 chromeos::system::StatisticsProvider::GetInstance());
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 // (4 languages (except islandic) + divider)=5 + all other languages 209 // (4 languages (except islandic) + divider)=5 + all other languages
209 EXPECT_GT(list->GetSize(), 5u); 210 EXPECT_GT(list->GetSize(), 5u);
210 211
211 EXPECT_LANGUAGE_CODE_AT(0, "fr") 212 EXPECT_LANGUAGE_CODE_AT(0, "fr")
212 EXPECT_LANGUAGE_CODE_AT(1, "en-US") 213 EXPECT_LANGUAGE_CODE_AT(1, "en-US")
213 EXPECT_LANGUAGE_CODE_AT(2, "de") 214 EXPECT_LANGUAGE_CODE_AT(2, "de")
214 EXPECT_LANGUAGE_CODE_AT(3, "it") 215 EXPECT_LANGUAGE_CODE_AT(3, "it")
215 EXPECT_LANGUAGE_CODE_AT(4, 216 EXPECT_LANGUAGE_CODE_AT(4,
216 chromeos::options::kVendorOtherLanguagesListDivider); 217 chromeos::options::kVendorOtherLanguagesListDivider);
217 } 218 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/mock_input_method_manager.cc ('k') | chromeos/ime/component_extension_ime_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698