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

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

Issue 236013002: Apply default wallpaper from customization manifest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove wallpaper URL from ServicesCustomizationDocumentTest. Created 6 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/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 30 matching lines...) Expand all
41 #include "chrome/browser/chromeos/login/keyboard_driven_oobe_key_handler.h" 41 #include "chrome/browser/chromeos/login/keyboard_driven_oobe_key_handler.h"
42 #include "chrome/browser/chromeos/login/login_utils.h" 42 #include "chrome/browser/chromeos/login/login_utils.h"
43 #include "chrome/browser/chromeos/login/login_wizard.h" 43 #include "chrome/browser/chromeos/login/login_wizard.h"
44 #include "chrome/browser/chromeos/login/oobe_display.h" 44 #include "chrome/browser/chromeos/login/oobe_display.h"
45 #include "chrome/browser/chromeos/login/startup_utils.h" 45 #include "chrome/browser/chromeos/login/startup_utils.h"
46 #include "chrome/browser/chromeos/login/user_manager.h" 46 #include "chrome/browser/chromeos/login/user_manager.h"
47 #include "chrome/browser/chromeos/login/webui_login_display.h" 47 #include "chrome/browser/chromeos/login/webui_login_display.h"
48 #include "chrome/browser/chromeos/login/webui_login_view.h" 48 #include "chrome/browser/chromeos/login/webui_login_view.h"
49 #include "chrome/browser/chromeos/login/wizard_controller.h" 49 #include "chrome/browser/chromeos/login/wizard_controller.h"
50 #include "chrome/browser/chromeos/mobile_config.h" 50 #include "chrome/browser/chromeos/mobile_config.h"
51 #include "chrome/browser/chromeos/net/delay_network_call.h"
51 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 52 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
52 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 53 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
53 #include "chrome/browser/chromeos/system/input_device_settings.h" 54 #include "chrome/browser/chromeos/system/input_device_settings.h"
54 #include "chrome/browser/chromeos/ui/focus_ring_controller.h" 55 #include "chrome/browser/chromeos/ui/focus_ring_controller.h"
55 #include "chrome/browser/lifetime/application_lifetime.h" 56 #include "chrome/browser/lifetime/application_lifetime.h"
56 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 57 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
57 #include "chrome/common/chrome_constants.h" 58 #include "chrome/common/chrome_constants.h"
58 #include "chrome/common/chrome_switches.h" 59 #include "chrome/common/chrome_switches.h"
59 #include "chrome/common/pref_names.h" 60 #include "chrome/common/pref_names.h"
60 #include "chromeos/audio/chromeos_sounds.h" 61 #include "chromeos/audio/chromeos_sounds.h"
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1179 !connector->IsEnterpriseManaged(); 1180 !connector->IsEnterpriseManaged();
1180 if (should_show_enrollment_screen) { 1181 if (should_show_enrollment_screen) {
1181 // Shows networks screen instead of enrollment screen to resume the 1182 // Shows networks screen instead of enrollment screen to resume the
1182 // interrupted auto start enrollment flow because enrollment screen does 1183 // interrupted auto start enrollment flow because enrollment screen does
1183 // not handle flaky network. See http://crbug.com/332572 1184 // not handle flaky network. See http://crbug.com/332572
1184 display_host->StartWizard(chromeos::WizardController::kNetworkScreenName, 1185 display_host->StartWizard(chromeos::WizardController::kNetworkScreenName,
1185 scoped_ptr<base::DictionaryValue>()); 1186 scoped_ptr<base::DictionaryValue>());
1186 return; 1187 return;
1187 } 1188 }
1188 1189
1190 if (StartupUtils::IsEulaAccepted()) {
1191 DelayNetworkCall(
1192 ServicesCustomizationDocument::GetInstance()
1193 ->EnsureCustomizationAppliedClosure(),
1194 base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS));
1195 }
1196
1189 bool show_login_screen = 1197 bool show_login_screen =
1190 (first_screen_name.empty() && oobe_complete) || 1198 (first_screen_name.empty() && oobe_complete) ||
1191 first_screen_name == chromeos::WizardController::kLoginScreenName; 1199 first_screen_name == chromeos::WizardController::kLoginScreenName;
1192 1200
1193 if (show_login_screen) { 1201 if (show_login_screen) {
1194 // R11 > R12 migration fix. See http://crosbug.com/p/4898. 1202 // R11 > R12 migration fix. See http://crosbug.com/p/4898.
1195 // If user has manually changed locale during R11 OOBE, locale will be set. 1203 // If user has manually changed locale during R11 OOBE, locale will be set.
1196 // On R12 > R12|R13 etc. this fix won't get activated since 1204 // On R12 > R12|R13 etc. this fix won't get activated since
1197 // OOBE process has set kApplicationLocale to non-default value. 1205 // OOBE process has set kApplicationLocale to non-default value.
1198 PrefService* prefs = g_browser_process->local_state(); 1206 PrefService* prefs = g_browser_process->local_state();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1259 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1252 new locale_util::SwitchLanguageCallback( 1260 new locale_util::SwitchLanguageCallback(
1253 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1261 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1254 1262
1255 // Load locale keyboards here. Hardware layout would be automatically enabled. 1263 // Load locale keyboards here. Hardware layout would be automatically enabled.
1256 locale_util::SwitchLanguage( 1264 locale_util::SwitchLanguage(
1257 locale, true, true /* login_layouts_only */, callback.Pass()); 1265 locale, true, true /* login_layouts_only */, callback.Pass());
1258 } 1266 }
1259 1267
1260 } // namespace chromeos 1268 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698