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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 139803010: Support comma separated hardware keyboard layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: /EnableInputMethods/ReplaceEnabeldInputMethods/ 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
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chromeos/ime/fake_input_method_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
955 955
956 const bool succeed = SetUserInputMethodImpl(username, manager); 956 const bool succeed = SetUserInputMethodImpl(username, manager);
957 957
958 // This is also a case when LRU layout is set only for a few local users, 958 // This is also a case when LRU layout is set only for a few local users,
959 // thus others need to be switched to default locale. 959 // thus others need to be switched to default locale.
960 // Otherwise they will end up using another user's locale to log in. 960 // Otherwise they will end up using another user's locale to log in.
961 if (!succeed) { 961 if (!succeed) {
962 DVLOG(0) << "SetUserInputMethod('" << username 962 DVLOG(0) << "SetUserInputMethod('" << username
963 << "'): failed to set user layout. Switching to default."; 963 << "'): failed to set user layout. Switching to default.";
964 964
965 manager->SetInputMethodDefault(); 965 manager->SetInputMethodLoginDefault();
966 } 966 }
967 } 967 }
968 968
969 void SigninScreenHandler::ShowSigninScreenIfReady() { 969 void SigninScreenHandler::ShowSigninScreenIfReady() {
970 LOG(WARNING) << "ShowSigninScreenIfReady() call."; 970 LOG(WARNING) << "ShowSigninScreenIfReady() call.";
971 971
972 if (!dns_cleared_ || !cookies_cleared_ || !delegate_) 972 if (!dns_cleared_ || !cookies_cleared_ || !delegate_)
973 return; 973 return;
974 974
975 std::string active_network_path = network_state_informer_->network_path(); 975 std::string active_network_path = network_state_informer_->network_path();
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1728 DCHECK(gaia_screen_handler_); 1728 DCHECK(gaia_screen_handler_);
1729 return gaia_screen_handler_->frame_state(); 1729 return gaia_screen_handler_->frame_state();
1730 } 1730 }
1731 1731
1732 net::Error SigninScreenHandler::FrameError() const { 1732 net::Error SigninScreenHandler::FrameError() const {
1733 DCHECK(gaia_screen_handler_); 1733 DCHECK(gaia_screen_handler_);
1734 return gaia_screen_handler_->frame_error(); 1734 return gaia_screen_handler_->frame_error();
1735 } 1735 }
1736 1736
1737 } // namespace chromeos 1737 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chromeos/ime/fake_input_method_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698