chrome/browser/prefs/browser_prefs.cc - Issue 12647008: Refactor OAuth2TokenService to have profile- and device-based implementations.

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/prefs/browser_prefs.cc

Issue 12647008: Refactor OAuth2TokenService to have profile- and device-based implementations. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: move function to minimize diff Created 7 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/settings/device_oauth2_token_service_factory.h ('K') | « chrome/browser/history/web_history_service.cc ('k') | chrome/browser/signin/oauth2_token_service.h » ('j') | chrome/browser/signin/oauth2_token_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index b3f9f2b2c8214081f19da0fc7cb7057f75455f90..7482ce507bf3c3b936455472132c81027ab0524c 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -125,6 +125,7 @@

#include "chrome/browser/chromeos/login/wizard_controller.h"

#include "chrome/browser/chromeos/preferences.h"

#include "chrome/browser/chromeos/proxy_config_service_impl.h"

+#include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"

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

#include "chrome/browser/chromeos/status/data_promo_notification.h"

#include "chrome/browser/policy/auto_enrollment_client.h"

@@ -236,6 +237,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

#if defined(OS_CHROMEOS)

chromeos::AudioHandler::RegisterPrefs(registry);

chromeos::DataPromoNotification::RegisterPrefs(registry);

+ chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);

chromeos::device_settings_cache::RegisterPrefs(registry);

chromeos::language_prefs::RegisterPrefs(registry);

chromeos::KioskAppManager::RegisterPrefs(registry);