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 "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/audio/sounds.h" | 9 #include "ash/audio/sounds.h" |
10 #include "ash/desktop_background/desktop_background_controller.h" | 10 #include "ash/desktop_background/desktop_background_controller.h" |
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1111 login_view_->set_is_hidden(true); | 1111 login_view_->set_is_hidden(true); |
1112 } | 1112 } |
1113 login_window_->GetNativeView()->SetName("WebUILoginView"); | 1113 login_window_->GetNativeView()->SetName("WebUILoginView"); |
1114 } | 1114 } |
1115 | 1115 |
1116 void LoginDisplayHostImpl::ResetLoginWindowAndView() { | 1116 void LoginDisplayHostImpl::ResetLoginWindowAndView() { |
1117 if (!login_window_) | 1117 if (!login_window_) |
1118 return; | 1118 return; |
1119 login_window_->Close(); | 1119 login_window_->Close(); |
1120 login_window_ = NULL; | 1120 login_window_ = NULL; |
| 1121 |
| 1122 if (!login_view_) |
| 1123 return; |
| 1124 login_view_->SetUIEnabled(true); |
1121 login_view_ = NULL; | 1125 login_view_ = NULL; |
1122 } | 1126 } |
1123 | 1127 |
1124 void LoginDisplayHostImpl::OnAuthPrewarmDone() { | 1128 void LoginDisplayHostImpl::OnAuthPrewarmDone() { |
1125 auth_prewarmer_.reset(); | 1129 auth_prewarmer_.reset(); |
1126 } | 1130 } |
1127 | 1131 |
1128 void LoginDisplayHostImpl::SetOobeProgressBarVisible(bool visible) { | 1132 void LoginDisplayHostImpl::SetOobeProgressBarVisible(bool visible) { |
1129 GetOobeUI()->ShowOobeUI(visible); | 1133 GetOobeUI()->ShowOobeUI(visible); |
1130 } | 1134 } |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1302 scoped_ptr<locale_util::SwitchLanguageCallback> callback( | 1306 scoped_ptr<locale_util::SwitchLanguageCallback> callback( |
1303 new locale_util::SwitchLanguageCallback( | 1307 new locale_util::SwitchLanguageCallback( |
1304 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); | 1308 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); |
1305 | 1309 |
1306 // Load locale keyboards here. Hardware layout would be automatically enabled. | 1310 // Load locale keyboards here. Hardware layout would be automatically enabled. |
1307 locale_util::SwitchLanguage( | 1311 locale_util::SwitchLanguage( |
1308 locale, true, true /* login_layouts_only */, callback.Pass()); | 1312 locale, true, true /* login_layouts_only */, callback.Pass()); |
1309 } | 1313 } |
1310 | 1314 |
1311 } // namespace chromeos | 1315 } // namespace chromeos |
OLD | NEW |