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 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1056 | 1056 |
1057 views::Widget::InitParams params( | 1057 views::Widget::InitParams params( |
1058 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); | 1058 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
1059 params.bounds = background_bounds(); | 1059 params.bounds = background_bounds(); |
1060 params.show_state = ui::SHOW_STATE_FULLSCREEN; | 1060 params.show_state = ui::SHOW_STATE_FULLSCREEN; |
1061 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 1061 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
1062 #if defined(USE_ATHENA) | 1062 #if defined(USE_ATHENA) |
1063 athena::ScreenManager::ContainerParams container_params( | 1063 athena::ScreenManager::ContainerParams container_params( |
1064 "LoginScreen", athena::CP_LOGIN_SCREEN); | 1064 "LoginScreen", athena::CP_LOGIN_SCREEN); |
1065 container_params.can_activate_children = true; | 1065 container_params.can_activate_children = true; |
| 1066 container_params.block_events = true; |
| 1067 container_params.modal_container_priority = |
| 1068 athena::CP_LOGIN_SCREEN_SYSTEM_MODAL; |
1066 login_screen_container_.reset( | 1069 login_screen_container_.reset( |
1067 athena::ScreenManager::Get()->CreateContainer(container_params)); | 1070 athena::ScreenManager::Get()->CreateContainer(container_params)); |
1068 params.parent = login_screen_container_.get(); | 1071 params.parent = login_screen_container_.get(); |
1069 login_screen_container_->SetLayoutManager( | 1072 login_screen_container_->SetLayoutManager( |
1070 new athena::FillLayoutManager(login_screen_container_.get())); | 1073 new athena::FillLayoutManager(login_screen_container_.get())); |
1071 #else | 1074 #else |
1072 params.parent = | 1075 params.parent = |
1073 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), | 1076 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), |
1074 ash::kShellWindowId_LockScreenContainer); | 1077 ash::kShellWindowId_LockScreenContainer); |
1075 #endif | 1078 #endif |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1295 scoped_ptr<locale_util::SwitchLanguageCallback> callback( | 1298 scoped_ptr<locale_util::SwitchLanguageCallback> callback( |
1296 new locale_util::SwitchLanguageCallback( | 1299 new locale_util::SwitchLanguageCallback( |
1297 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); | 1300 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); |
1298 | 1301 |
1299 // Load locale keyboards here. Hardware layout would be automatically enabled. | 1302 // Load locale keyboards here. Hardware layout would be automatically enabled. |
1300 locale_util::SwitchLanguage( | 1303 locale_util::SwitchLanguage( |
1301 locale, true, true /* login_layouts_only */, callback.Pass()); | 1304 locale, true, true /* login_layouts_only */, callback.Pass()); |
1302 } | 1305 } |
1303 | 1306 |
1304 } // namespace chromeos | 1307 } // namespace chromeos |
OLD | NEW |