chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h - Issue 985093002: Fix up Owner settings on first load

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/ownership/owner_settings_service_chromeos_factory.h

Issue 985093002: Fix up Owner settings on first load (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: based off mattias' patch that injects CrosSettings for testing Created 5 years, 9 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/ownership/owner_settings_service_chromeos.cc ('K') | « chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc ('k') | chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc » ('j') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h

diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h

index 8799ac1d1f8853f792941371fae7720eb030edd4..12ecb7443defef0a65d0d730c5e0329e6d5a8406 100644

--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h

+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h

@@ -23,6 +23,7 @@ class OwnerKeyUtil;

namespace chromeos {

+class CrosSettings;

class DeviceSettingsService;

class OwnerSettingsServiceChromeOS;

@@ -37,6 +38,8 @@ class OwnerSettingsServiceChromeOSFactory

static void SetDeviceSettingsServiceForTesting(

DeviceSettingsService* device_settings_service);

+ static void SetCrosSettingsForTesting(CrosSettings* cros_settings);

scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil();

void SetOwnerKeyUtilForTesting(