OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/chromeos/chromeos_version.h" | 8 #include "base/chromeos/chromeos_version.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 if (!users_lru_input_methods->GetStringWithoutPathExpansion(username, | 333 if (!users_lru_input_methods->GetStringWithoutPathExpansion(username, |
334 &input_method)) { | 334 &input_method)) { |
335 DLOG(INFO) << "SetUserInputMethod('" << username | 335 DLOG(INFO) << "SetUserInputMethod('" << username |
336 << "'): no input method for this user"; | 336 << "'): no input method for this user"; |
337 return false; | 337 return false; |
338 } | 338 } |
339 | 339 |
340 if (input_method.empty()) | 340 if (input_method.empty()) |
341 return false; | 341 return false; |
342 | 342 |
343 if (!manager->IsFullLatinKeyboard(input_method)) { | 343 if (!manager->IsLoginKeyboard(input_method)) { |
344 LOG(WARNING) << "SetUserInputMethod('" << username | 344 LOG(WARNING) << "SetUserInputMethod('" << username |
345 << "'): stored user LRU input method '" << input_method | 345 << "'): stored user LRU input method '" << input_method |
346 << "' is no longer Full Latin Keyboard Language" | 346 << "' is no longer Full Latin Keyboard Language" |
347 << " (entry dropped). Use hardware default instead."; | 347 << " (entry dropped). Use hardware default instead."; |
348 | 348 |
349 DictionaryPrefUpdate updater(local_state, prefs::kUsersLRUInputMethod); | 349 DictionaryPrefUpdate updater(local_state, prefs::kUsersLRUInputMethod); |
350 | 350 |
351 base::DictionaryValue* const users_lru_input_methods = updater.Get(); | 351 base::DictionaryValue* const users_lru_input_methods = updater.Get(); |
352 if (users_lru_input_methods != NULL) { | 352 if (users_lru_input_methods != NULL) { |
353 users_lru_input_methods->SetStringWithoutPathExpansion(username, ""); | 353 users_lru_input_methods->SetStringWithoutPathExpansion(username, ""); |
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1758 rvh->ExecuteJavascriptInWebFrame( | 1758 rvh->ExecuteJavascriptInWebFrame( |
1759 ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"), | 1759 ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"), |
1760 ASCIIToUTF16(code)); | 1760 ASCIIToUTF16(code)); |
1761 | 1761 |
1762 // Test properties are cleared in HandleCompleteLogin because the form | 1762 // Test properties are cleared in HandleCompleteLogin because the form |
1763 // submission might fail and login will not be attempted after reloading | 1763 // submission might fail and login will not be attempted after reloading |
1764 // if they are cleared here. | 1764 // if they are cleared here. |
1765 } | 1765 } |
1766 | 1766 |
1767 } // namespace chromeos | 1767 } // namespace chromeos |
OLD | NEW |