chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc - Issue 23532034: Postpone loading about:flags ui until the certificates have been loaded

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/kiosk_mode/kiosk_mode_settings.cc

Issue 23532034: Postpone loading about:flags ui until the certificates have been loaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 3 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

« no previous file with comments | « chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h ('k') | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc

diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc

index 8b960066ab46cc40bd3cb73751e4bb06ed0192cd..bb182e716d9b3fc2507c5ac0740d33e9895dee28 100644

--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc

+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc

@@ -177,8 +177,7 @@ KioskModeSettings::~KioskModeSettings() {

}

void KioskModeSettings::VerifyModeIsKnown(

- DeviceSettingsService::OwnershipStatus status,

- bool is_owner) {

+ DeviceSettingsService::OwnershipStatus status) {

if (status != DeviceSettingsService::OWNERSHIP_TAKEN)

return;

@@ -192,7 +191,7 @@ void KioskModeSettings::VerifyModeIsKnown(

content::BrowserThread::PostDelayedTask(

content::BrowserThread::UI, FROM_HERE,

base::Bind(&KioskModeSettings::VerifyModeIsKnown,

- base::Unretained(this), status, is_owner),

+ base::Unretained(this), status),

base::TimeDelta::FromMilliseconds(kDeviceModeFetchRetryDelayMs));

break;

case policy::DEVICE_MODE_RETAIL_KIOSK: