chrome/browser/chromeos/login/login_display_host_impl.cc - Issue 236013002: Apply default wallpaper from customization manifest.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/customization_document_unittest.cc ('K') | « chrome/browser/chromeos/customization_wallpaper_downloader.cc ('k') | chrome/browser/chromeos/login/user_image.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/login_display_host_impl.cc

diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc

index 76d675d85cf5a1eb0cc0c727183a06a20a09bee6..4692b4e362147ef4033412202ef739837ebcad51 100644

--- a/chrome/browser/chromeos/login/login_display_host_impl.cc

+++ b/chrome/browser/chromeos/login/login_display_host_impl.cc

@@ -48,6 +48,7 @@

#include "chrome/browser/chromeos/login/webui_login_view.h"

#include "chrome/browser/chromeos/login/wizard_controller.h"

#include "chrome/browser/chromeos/mobile_config.h"

+#include "chrome/browser/chromeos/net/delay_network_call.h"

#include "chrome/browser/chromeos/policy/auto_enrollment_client.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/chromeos/system/input_device_settings.h"

@@ -1186,6 +1187,13 @@ void ShowLoginWizard(const std::string& first_screen_name) {

return;

}

+ if (StartupUtils::IsEulaAccepted()) {

+ DelayNetworkCall(

+ ServicesCustomizationDocument::GetInstance()

+ ->EnsureCustomizationAppliedClosure(),

+ base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS));

+ }

bool show_login_screen =

(first_screen_name.empty() && oobe_complete) ||

first_screen_name == chromeos::WizardController::kLoginScreenName;