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

Side by Side Diff: chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc

Issue 1411603005: Add Workman keyboard layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add trailing comma according to review feedback Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/chromeos/input_method/input_method_persistence.h" 8 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"
9 #include "chrome/browser/chromeos/language_preferences.h" 9 #include "chrome/browser/chromeos/language_preferences.h"
10 #include "chrome/browser/chromeos/login/login_manager_test.h" 10 #include "chrome/browser/chromeos/login/login_manager_test.h"
(...skipping 13 matching lines...) Expand all
24 const char kTestUser2[] = "test-user2@gmail.com"; 24 const char kTestUser2[] = "test-user2@gmail.com";
25 const char kTestUser3[] = "test-user3@gmail.com"; 25 const char kTestUser3[] = "test-user3@gmail.com";
26 26
27 void Append_en_US_InputMethods(std::vector<std::string>* out) { 27 void Append_en_US_InputMethods(std::vector<std::string>* out) {
28 out->push_back("xkb:us::eng"); 28 out->push_back("xkb:us::eng");
29 out->push_back("xkb:us:intl:eng"); 29 out->push_back("xkb:us:intl:eng");
30 out->push_back("xkb:us:altgr-intl:eng"); 30 out->push_back("xkb:us:altgr-intl:eng");
31 out->push_back("xkb:us:dvorak:eng"); 31 out->push_back("xkb:us:dvorak:eng");
32 out->push_back("xkb:us:dvp:eng"); 32 out->push_back("xkb:us:dvp:eng");
33 out->push_back("xkb:us:colemak:eng"); 33 out->push_back("xkb:us:colemak:eng");
34 out->push_back("xkb:us:workman:eng");
35 out->push_back("xkb:us:workman-intl:eng");
34 chromeos::input_method::InputMethodManager::Get()->MigrateInputMethods(out); 36 chromeos::input_method::InputMethodManager::Get()->MigrateInputMethods(out);
35 } 37 }
36 38
37 class FocusPODWaiter { 39 class FocusPODWaiter {
38 public: 40 public:
39 FocusPODWaiter() : focused_(false), runner_(new content::MessageLoopRunner) { 41 FocusPODWaiter() : focused_(false), runner_(new content::MessageLoopRunner) {
40 GetOobeUI() 42 GetOobeUI()
41 ->signin_screen_handler_for_test() 43 ->signin_screen_handler_for_test()
42 ->SetFocusPODCallbackForTesting( 44 ->SetFocusPODCallbackForTesting(
43 base::Bind(&FocusPODWaiter::OnFocusPOD, base::Unretained(this))); 45 base::Bind(&FocusPODWaiter::OnFocusPOD, base::Unretained(this)));
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 // Switch back. 272 // Switch back.
271 js_checker().Evaluate("$('gaia-signin').cancel()"); 273 js_checker().Evaluate("$('gaia-signin').cancel()");
272 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait(); 274 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
273 275
274 EXPECT_EQ(expected_input_methods, 276 EXPECT_EQ(expected_input_methods,
275 input_method::InputMethodManager::Get() 277 input_method::InputMethodManager::Get()
276 ->GetActiveIMEState() 278 ->GetActiveIMEState()
277 ->GetActiveInputMethodIds()); 279 ->GetActiveInputMethodIds());
278 } 280 }
279 } // namespace chromeos 281 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698