| 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 <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
| (...skipping 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1268 prefs->GetBoolean(prefs::kOwnerTapToClickEnabled)); | 1268 prefs->GetBoolean(prefs::kOwnerTapToClickEnabled)); |
| 1269 } | 1269 } |
| 1270 system::InputDeviceSettings::Get()->SetNaturalScroll( | 1270 system::InputDeviceSettings::Get()->SetNaturalScroll( |
| 1271 base::CommandLine::ForCurrentProcess()->HasSwitch( | 1271 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 1272 switches::kNaturalScrollDefault)); | 1272 switches::kNaturalScrollDefault)); |
| 1273 | 1273 |
| 1274 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); | 1274 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); |
| 1275 | 1275 |
| 1276 g_browser_process->platform_part()->SessionManager()->SetSessionState( | 1276 g_browser_process->platform_part()->SessionManager()->SetSessionState( |
| 1277 StartupUtils::IsOobeCompleted() | 1277 StartupUtils::IsOobeCompleted() |
| 1278 ? session_manager::SESSION_STATE_LOGIN_PRIMARY | 1278 ? session_manager::SessionState::LOGIN_PRIMARY |
| 1279 : session_manager::SESSION_STATE_OOBE); | 1279 : session_manager::SessionState::OOBE); |
| 1280 | 1280 |
| 1281 LoginDisplayHostImpl* display_host = new LoginDisplayHostImpl(screen_bounds); | 1281 LoginDisplayHostImpl* display_host = new LoginDisplayHostImpl(screen_bounds); |
| 1282 | 1282 |
| 1283 bool show_app_launch_splash_screen = | 1283 bool show_app_launch_splash_screen = |
| 1284 (first_screen_name == WizardController::kAppLaunchSplashScreenName); | 1284 (first_screen_name == WizardController::kAppLaunchSplashScreenName); |
| 1285 if (show_app_launch_splash_screen) { | 1285 if (show_app_launch_splash_screen) { |
| 1286 const std::string& auto_launch_app_id = | 1286 const std::string& auto_launch_app_id = |
| 1287 KioskAppManager::Get()->GetAutoLaunchApp(); | 1287 KioskAppManager::Get()->GetAutoLaunchApp(); |
| 1288 const bool diagnostic_mode = false; | 1288 const bool diagnostic_mode = false; |
| 1289 const bool auto_launch = true; | 1289 const bool auto_launch = true; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1366 | 1366 |
| 1367 locale_util::SwitchLanguageCallback callback( | 1367 locale_util::SwitchLanguageCallback callback( |
| 1368 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data)))); | 1368 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data)))); |
| 1369 | 1369 |
| 1370 // Load locale keyboards here. Hardware layout would be automatically enabled. | 1370 // Load locale keyboards here. Hardware layout would be automatically enabled. |
| 1371 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, | 1371 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, |
| 1372 callback, ProfileManager::GetActiveUserProfile()); | 1372 callback, ProfileManager::GetActiveUserProfile()); |
| 1373 } | 1373 } |
| 1374 | 1374 |
| 1375 } // namespace chromeos | 1375 } // namespace chromeos |
| OLD | NEW |