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

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: 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 unified diff | Download patch | Annotate | Revision Log
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.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 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 942
943 const bool succeed = SetUserInputMethodImpl(username, manager); 943 const bool succeed = SetUserInputMethodImpl(username, manager);
944 944
945 // This is also a case when LRU layout is set only for a few local users, 945 // This is also a case when LRU layout is set only for a few local users,
946 // thus others need to be switched to default locale. 946 // thus others need to be switched to default locale.
947 // Otherwise they will end up using another user's locale to log in. 947 // Otherwise they will end up using another user's locale to log in.
948 if (!succeed) { 948 if (!succeed) {
949 DVLOG(0) << "SetUserInputMethod('" << username 949 DVLOG(0) << "SetUserInputMethod('" << username
950 << "'): failed to set user layout. Switching to default."; 950 << "'): failed to set user layout. Switching to default.";
951 951
952 manager->SetInputMethodDefault(); 952 manager->SetInputMethodLoginDefault();
953 } 953 }
954 } 954 }
955 955
956 void SigninScreenHandler::ShowSigninScreenIfReady() { 956 void SigninScreenHandler::ShowSigninScreenIfReady() {
957 LOG(WARNING) << "ShowSigninScreenIfReady() call."; 957 LOG(WARNING) << "ShowSigninScreenIfReady() call.";
958 958
959 if (!dns_cleared_ || !cookies_cleared_ || !delegate_) 959 if (!dns_cleared_ || !cookies_cleared_ || !delegate_)
960 return; 960 return;
961 961
962 std::string active_network_path = network_state_informer_->network_path(); 962 std::string active_network_path = network_state_informer_->network_path();
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
1689 DCHECK(gaia_screen_handler_); 1689 DCHECK(gaia_screen_handler_);
1690 return gaia_screen_handler_->frame_state(); 1690 return gaia_screen_handler_->frame_state();
1691 } 1691 }
1692 1692
1693 net::Error SigninScreenHandler::FrameError() const { 1693 net::Error SigninScreenHandler::FrameError() const {
1694 DCHECK(gaia_screen_handler_); 1694 DCHECK(gaia_screen_handler_);
1695 return gaia_screen_handler_->frame_error(); 1695 return gaia_screen_handler_->frame_error();
1696 } 1696 }
1697 1697
1698 } // namespace chromeos 1698 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698