chrome/browser/chromeos/chrome_browser_main_chromeos.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/chromeos/chrome_browser_main_chromeos.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

« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_app_manager.cc ('k') | chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index 659e00ddfa236fc0b5982579996d7c139c22abec..a0222b5273e7958b9a7eedc906fa46c29082bc86 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -55,7 +55,7 @@

#include "chrome/browser/chromeos/memory/oom_priority_manager.h"

#include "chrome/browser/chromeos/net/network_portal_detector_impl.h"

#include "chrome/browser/chromeos/options/cert_library.h"

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

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

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

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

#include "chrome/browser/chromeos/power/idle_action_warning_observer.h"

@@ -187,7 +187,7 @@

DeviceSettingsService::Initialize();

DeviceSettingsService::Get()->SetSessionManager(

DBusThreadManager::Get()->GetSessionManagerClient(),

- OwnerSettingsServiceChromeOSFactory::GetInstance()->GetOwnerKeyUtil());

+ OwnerSettingsServiceFactory::GetInstance()->GetOwnerKeyUtil());

}

~DBusServices() {