| 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 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 953 } | 953 } |
| 954 | 954 |
| 955 void LoginDisplayHostImpl::ShowWebUI() { | 955 void LoginDisplayHostImpl::ShowWebUI() { |
| 956 if (!login_window_ || !login_view_) { | 956 if (!login_window_ || !login_view_) { |
| 957 NOTREACHED(); | 957 NOTREACHED(); |
| 958 return; | 958 return; |
| 959 } | 959 } |
| 960 LOG(WARNING) << "Login WebUI >> Show already initialized UI"; | 960 LOG(WARNING) << "Login WebUI >> Show already initialized UI"; |
| 961 login_window_->Show(); | 961 login_window_->Show(); |
| 962 login_view_->GetWebContents()->Focus(); | 962 login_view_->GetWebContents()->Focus(); |
| 963 login_view_->RequestFocus(); |
| 963 login_view_->SetStatusAreaVisible(status_area_saved_visibility_); | 964 login_view_->SetStatusAreaVisible(status_area_saved_visibility_); |
| 964 login_view_->OnPostponedShow(); | 965 login_view_->OnPostponedShow(); |
| 965 | 966 |
| 966 // Login window could be shown after the spring charger dialog shows, and | 967 // Login window could be shown after the spring charger dialog shows, and |
| 967 // take away the focus from it. Set the focus back to the charger dialog | 968 // take away the focus from it. Set the focus back to the charger dialog |
| 968 // if it is visible. | 969 // if it is visible. |
| 969 // See crbug.com/328538. | 970 // See crbug.com/328538. |
| 970 ChargerReplacementDialog::SetFocusOnChargerDialogIfVisible(); | 971 ChargerReplacementDialog::SetFocusOnChargerDialogIfVisible(); |
| 971 | 972 |
| 972 // We should reset this flag to allow changing of status area visibility. | 973 // We should reset this flag to allow changing of status area visibility. |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1242 scoped_ptr<locale_util::SwitchLanguageCallback> callback( | 1243 scoped_ptr<locale_util::SwitchLanguageCallback> callback( |
| 1243 new locale_util::SwitchLanguageCallback( | 1244 new locale_util::SwitchLanguageCallback( |
| 1244 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); | 1245 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); |
| 1245 | 1246 |
| 1246 // Load locale keyboards here. Hardware layout would be automatically enabled. | 1247 // Load locale keyboards here. Hardware layout would be automatically enabled. |
| 1247 locale_util::SwitchLanguage( | 1248 locale_util::SwitchLanguage( |
| 1248 locale, true, true /* login_layouts_only */, callback.Pass()); | 1249 locale, true, true /* login_layouts_only */, callback.Pass()); |
| 1249 } | 1250 } |
| 1250 | 1251 |
| 1251 } // namespace chromeos | 1252 } // namespace chromeos |
| OLD | NEW |