chrome/browser/ui/webui/flags_ui.cc - Issue 788243002: Revert of Revert of Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpda...

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/ui/webui/flags_ui.cc

Issue 788243002: Revert of Revert of Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpda... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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/settings/session_manager_operation_unittest.cc ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/flags_ui.cc

diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc

index c54147caa4817338f376da9617d358a0bedf9dae..d586c827abe485ac264f2505679bcb81af41227e 100644

--- a/chrome/browser/ui/webui/flags_ui.cc

+++ b/chrome/browser/ui/webui/flags_ui.cc

@@ -292,15 +292,15 @@

#if defined(OS_CHROMEOS)

if (base::SysInfo::IsRunningOnChromeOS() &&

- chromeos::OwnerSettingsServiceChromeOSFactory::GetForProfile(profile)) {

+ chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(

+ profile)) {

chromeos::OwnerSettingsServiceChromeOS* service =

- chromeos::OwnerSettingsServiceChromeOSFactory::GetForProfile(profile);

+ chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(

+ profile);

service->IsOwnerAsync(base::Bind(

&FinishInitialization, weak_factory_.GetWeakPtr(), profile, handler));

} else {

- FinishInitialization(weak_factory_.GetWeakPtr(),

- profile,

- handler,

+ FinishInitialization(weak_factory_.GetWeakPtr(), profile, handler,

false /* current_user_is_owner */);

}

#else