| 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 840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 851 } | 851 } |
| 852 | 852 |
| 853 //////////////////////////////////////////////////////////////////////////////// | 853 //////////////////////////////////////////////////////////////////////////////// |
| 854 // LoginDisplayHostImpl, keyboard::KeyboardControllerObserver: | 854 // LoginDisplayHostImpl, keyboard::KeyboardControllerObserver: |
| 855 // implementation: | 855 // implementation: |
| 856 | 856 |
| 857 void LoginDisplayHostImpl::OnKeyboardBoundsChanging( | 857 void LoginDisplayHostImpl::OnKeyboardBoundsChanging( |
| 858 const gfx::Rect& new_bounds) { | 858 const gfx::Rect& new_bounds) { |
| 859 if (new_bounds.IsEmpty()) { | 859 if (new_bounds.IsEmpty()) { |
| 860 // Keyboard has been hidden. | 860 // Keyboard has been hidden. |
| 861 if (GetOobeUI()) { | 861 if (GetOobeUI()) |
| 862 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(true); | 862 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(true); |
| 863 GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(false, new_bounds); | |
| 864 } | |
| 865 } else if (!new_bounds.IsEmpty()) { | 863 } else if (!new_bounds.IsEmpty()) { |
| 866 // Keyboard has been shown. | 864 // Keyboard has been shown. |
| 867 if (GetOobeUI()) { | 865 if (GetOobeUI()) |
| 868 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false); | 866 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false); |
| 869 GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(true, new_bounds); | |
| 870 } | |
| 871 } | 867 } |
| 872 } | 868 } |
| 873 | 869 |
| 874 //////////////////////////////////////////////////////////////////////////////// | 870 //////////////////////////////////////////////////////////////////////////////// |
| 875 // LoginDisplayHostImpl, gfx::DisplayObserver implementation: | 871 // LoginDisplayHostImpl, gfx::DisplayObserver implementation: |
| 876 | 872 |
| 877 void LoginDisplayHostImpl::OnDisplayAdded(const gfx::Display& new_display) { | 873 void LoginDisplayHostImpl::OnDisplayAdded(const gfx::Display& new_display) { |
| 878 } | 874 } |
| 879 | 875 |
| 880 void LoginDisplayHostImpl::OnDisplayRemoved(const gfx::Display& old_display) { | 876 void LoginDisplayHostImpl::OnDisplayRemoved(const gfx::Display& old_display) { |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1260 | 1256 |
| 1261 locale_util::SwitchLanguageCallback callback( | 1257 locale_util::SwitchLanguageCallback callback( |
| 1262 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))); | 1258 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))); |
| 1263 | 1259 |
| 1264 // Load locale keyboards here. Hardware layout would be automatically enabled. | 1260 // Load locale keyboards here. Hardware layout would be automatically enabled. |
| 1265 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, | 1261 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, |
| 1266 callback, ProfileManager::GetActiveUserProfile()); | 1262 callback, ProfileManager::GetActiveUserProfile()); |
| 1267 } | 1263 } |
| 1268 | 1264 |
| 1269 } // namespace chromeos | 1265 } // namespace chromeos |
| OLD | NEW |