chrome/browser/ui/webui/flags_ui.cc - Issue 565293003: Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*.

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 565293003: Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

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 148a9c5195b0da0fe6922c7141998ca0f5495719..88dfe1938846c853de22aaf901b396f51f429ebc 100644

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

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

@@ -34,8 +34,8 @@

#if defined(OS_CHROMEOS)

#include "base/sys_info.h"

-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"

-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"

+#include "chrome/browser/chromeos/ownership/owner_settings_service.h"

+#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/owner_flags_storage.h"

#include "chromeos/dbus/dbus_thread_manager.h"

@@ -292,8 +292,8 @@

web_ui->AddMessageHandler(handler);

#if defined(OS_CHROMEOS)

- chromeos::OwnerSettingsServiceChromeOS* service =

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

+ chromeos::OwnerSettingsService* service =

+ chromeos::OwnerSettingsServiceFactory::GetForProfile(profile);

if (service) {

service->IsOwnerAsync(base::Bind(

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

« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »