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

Unified Diff: chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc

Issue 139803010: Support comma separated hardware keyboard layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc
diff --git a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc
index b21a5bfddc4779f4f37d3549c0001a9882f6128e..7ec8b6fbd97d0865734cfd506fdfa37406838742 100644
--- a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc
+++ b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc
@@ -125,8 +125,11 @@ IN_PROC_BROWSER_TEST_F(ModeIndicatorBrowserTest, Bounds) {
InputMethodManager* imm = InputMethodManager::Get();
ASSERT_TRUE(imm);
+ std::vector<std::string> keyboard_layouts;
+ keyboard_layouts.push_back("xkb:fr::fra");
+
// Add keyboard layouts to enable the mode indicator.
- imm->EnableLoginLayouts("fr", "xkb:fr::fra");
+ imm->EnableLoginLayouts("fr", keyboard_layouts);
ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
chromeos::IBusPanelCandidateWindowHandlerInterface* candidate_window =
@@ -189,8 +192,11 @@ IN_PROC_BROWSER_TEST_F(ModeIndicatorBrowserTest, NumOfWidgets) {
InputMethodManager* imm = InputMethodManager::Get();
ASSERT_TRUE(imm);
+ std::vector<std::string> keyboard_layouts;
+ keyboard_layouts.push_back("xkb:fr::fra");
+
// Add keyboard layouts to enable the mode indicator.
- imm->EnableLoginLayouts("fr", "xkb:fr::fra");
+ imm->EnableLoginLayouts("fr", keyboard_layouts);
ASSERT_LT(1UL, imm->GetNumActiveInputMethods());
chromeos::IBusPanelCandidateWindowHandlerInterface* candidate_window =

Powered by Google App Engine
This is Rietveld 408576698