Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Side by Side Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 2444383008: session_manager: Create ChromeSessionManager early (Closed)
Patch Set: for #4 Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/wallpaper/wallpaper_controller.h" 10 #include "ash/common/wallpaper/wallpaper_controller.h"
(...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 prefs->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight)); 1267 prefs->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight));
1268 system::InputDeviceSettings::Get()->SetTapToClick( 1268 system::InputDeviceSettings::Get()->SetTapToClick(
1269 prefs->GetBoolean(prefs::kOwnerTapToClickEnabled)); 1269 prefs->GetBoolean(prefs::kOwnerTapToClickEnabled));
1270 } 1270 }
1271 system::InputDeviceSettings::Get()->SetNaturalScroll( 1271 system::InputDeviceSettings::Get()->SetNaturalScroll(
1272 base::CommandLine::ForCurrentProcess()->HasSwitch( 1272 base::CommandLine::ForCurrentProcess()->HasSwitch(
1273 switches::kNaturalScrollDefault)); 1273 switches::kNaturalScrollDefault));
1274 1274
1275 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); 1275 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
1276 1276
1277 g_browser_process->platform_part()->SessionManager()->SetSessionState( 1277 session_manager::SessionManager::Get()->SetSessionState(
1278 StartupUtils::IsOobeCompleted() 1278 StartupUtils::IsOobeCompleted()
1279 ? session_manager::SessionState::LOGIN_PRIMARY 1279 ? session_manager::SessionState::LOGIN_PRIMARY
1280 : session_manager::SessionState::OOBE); 1280 : session_manager::SessionState::OOBE);
1281 1281
1282 LoginDisplayHostImpl* display_host = new LoginDisplayHostImpl(screen_bounds); 1282 LoginDisplayHostImpl* display_host = new LoginDisplayHostImpl(screen_bounds);
1283 1283
1284 bool show_app_launch_splash_screen = 1284 bool show_app_launch_splash_screen =
1285 (first_screen_name == WizardController::kAppLaunchSplashScreenName); 1285 (first_screen_name == WizardController::kAppLaunchSplashScreenName);
1286 if (show_app_launch_splash_screen) { 1286 if (show_app_launch_splash_screen) {
1287 const std::string& auto_launch_app_id = 1287 const std::string& auto_launch_app_id =
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 1367
1368 locale_util::SwitchLanguageCallback callback( 1368 locale_util::SwitchLanguageCallback callback(
1369 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data)))); 1369 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data))));
1370 1370
1371 // Load locale keyboards here. Hardware layout would be automatically enabled. 1371 // Load locale keyboards here. Hardware layout would be automatically enabled.
1372 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, 1372 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
1373 callback, ProfileManager::GetActiveUserProfile()); 1373 callback, ProfileManager::GetActiveUserProfile());
1374 } 1374 }
1375 1375
1376 } // namespace chromeos 1376 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | chrome/browser/chromeos/login/ui/user_adding_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698