OLD | NEW |
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 11 matching lines...) Expand all Loading... |
22 | 22 |
23 const char kTestUser1[] = "test-user1@gmail.com"; | 23 const char kTestUser1[] = "test-user1@gmail.com"; |
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:colemak:eng"); | 33 out->push_back("xkb:us:colemak:eng"); |
33 chromeos::input_method::InputMethodManager::Get()->MigrateInputMethods(out); | 34 chromeos::input_method::InputMethodManager::Get()->MigrateInputMethods(out); |
34 } | 35 } |
35 | 36 |
36 class FocusPODWaiter { | 37 class FocusPODWaiter { |
37 public: | 38 public: |
38 FocusPODWaiter() : focused_(false), runner_(new content::MessageLoopRunner) { | 39 FocusPODWaiter() : focused_(false), runner_(new content::MessageLoopRunner) { |
39 GetOobeUI() | 40 GetOobeUI() |
40 ->signin_screen_handler_for_test() | 41 ->signin_screen_handler_for_test() |
41 ->SetFocusPODCallbackForTesting( | 42 ->SetFocusPODCallbackForTesting( |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 // Switch back. | 270 // Switch back. |
270 js_checker().Evaluate("$('cancel-add-user-button').click()"); | 271 js_checker().Evaluate("$('cancel-add-user-button').click()"); |
271 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait(); | 272 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait(); |
272 | 273 |
273 EXPECT_EQ(expected_input_methods, | 274 EXPECT_EQ(expected_input_methods, |
274 input_method::InputMethodManager::Get() | 275 input_method::InputMethodManager::Get() |
275 ->GetActiveIMEState() | 276 ->GetActiveIMEState() |
276 ->GetActiveInputMethodIds()); | 277 ->GetActiveInputMethodIds()); |
277 } | 278 } |
278 } // namespace chromeos | 279 } // namespace chromeos |
OLD | NEW |