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

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

Issue 371033005: Remove unused LOGGED_IN_OOBE LoggedInState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 5 months 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
« no previous file with comments | « no previous file | chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <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 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1175 prefs->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight)); 1175 prefs->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight));
1176 system::InputDeviceSettings::Get()->SetTapToClick( 1176 system::InputDeviceSettings::Get()->SetTapToClick(
1177 prefs->GetBoolean(prefs::kOwnerTapToClickEnabled)); 1177 prefs->GetBoolean(prefs::kOwnerTapToClickEnabled));
1178 } 1178 }
1179 system::InputDeviceSettings::Get()->SetNaturalScroll( 1179 system::InputDeviceSettings::Get()->SetNaturalScroll(
1180 CommandLine::ForCurrentProcess()->HasSwitch( 1180 CommandLine::ForCurrentProcess()->HasSwitch(
1181 switches::kNaturalScrollDefault)); 1181 switches::kNaturalScrollDefault));
1182 1182
1183 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); 1183 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
1184 1184
1185 // Check whether we need to execute OOBE process.
1186 bool oobe_complete = chromeos::StartupUtils::IsOobeCompleted();
1187 if (!oobe_complete) {
1188 LoginState::Get()->SetLoggedInState(
1189 LoginState::LOGGED_IN_OOBE, LoginState::LOGGED_IN_USER_NONE);
1190 } else {
1191 LoginState::Get()->SetLoggedInState(
1192 LoginState::LOGGED_IN_NONE, LoginState::LOGGED_IN_USER_NONE);
1193 }
1194
1195 LoginDisplayHost* display_host = new LoginDisplayHostImpl(screen_bounds); 1185 LoginDisplayHost* display_host = new LoginDisplayHostImpl(screen_bounds);
1196 1186
1197 bool show_app_launch_splash_screen = (first_screen_name == 1187 bool show_app_launch_splash_screen = (first_screen_name ==
1198 chromeos::WizardController::kAppLaunchSplashScreenName); 1188 chromeos::WizardController::kAppLaunchSplashScreenName);
1199 if (show_app_launch_splash_screen) { 1189 if (show_app_launch_splash_screen) {
1200 const std::string& auto_launch_app_id = 1190 const std::string& auto_launch_app_id =
1201 chromeos::KioskAppManager::Get()->GetAutoLaunchApp(); 1191 chromeos::KioskAppManager::Get()->GetAutoLaunchApp();
1202 display_host->StartAppLaunch(auto_launch_app_id, 1192 display_host->StartAppLaunch(auto_launch_app_id,
1203 false /* diagnostic_mode */); 1193 false /* diagnostic_mode */);
1204 return; 1194 return;
1205 } 1195 }
1206 1196
1197 // Check whether we need to execute OOBE process.
1198 bool oobe_complete = chromeos::StartupUtils::IsOobeCompleted();
1207 policy::BrowserPolicyConnectorChromeOS* connector = 1199 policy::BrowserPolicyConnectorChromeOS* connector =
1208 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 1200 g_browser_process->platform_part()->browser_policy_connector_chromeos();
1209 bool enrollment_screen_wanted = 1201 bool enrollment_screen_wanted =
1210 chromeos::WizardController::ShouldRecoverEnrollment() || 1202 chromeos::WizardController::ShouldRecoverEnrollment() ||
1211 (chromeos::WizardController::ShouldAutoStartEnrollment() && 1203 (chromeos::WizardController::ShouldAutoStartEnrollment() &&
1212 oobe_complete && 1204 oobe_complete &&
1213 !connector->IsEnterpriseManaged()); 1205 !connector->IsEnterpriseManaged());
1214 if (enrollment_screen_wanted && first_screen_name.empty()) { 1206 if (enrollment_screen_wanted && first_screen_name.empty()) {
1215 // Shows networks screen instead of enrollment screen to resume the 1207 // Shows networks screen instead of enrollment screen to resume the
1216 // interrupted auto start enrollment flow because enrollment screen does 1208 // interrupted auto start enrollment flow because enrollment screen does
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
1276 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1268 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1277 new locale_util::SwitchLanguageCallback( 1269 new locale_util::SwitchLanguageCallback(
1278 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1270 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1279 1271
1280 // Load locale keyboards here. Hardware layout would be automatically enabled. 1272 // Load locale keyboards here. Hardware layout would be automatically enabled.
1281 locale_util::SwitchLanguage( 1273 locale_util::SwitchLanguage(
1282 locale, true, true /* login_layouts_only */, callback.Pass()); 1274 locale, true, true /* login_layouts_only */, callback.Pass());
1283 } 1275 }
1284 1276
1285 } // namespace chromeos 1277 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698