chrome/browser/history/web_history_service.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/history/web_history_service.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/DEPS ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | chrome/browser/signin/oauth2_token_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/web_history_service.cc

diff --git a/chrome/browser/history/web_history_service.cc b/chrome/browser/history/web_history_service.cc

index 4ef92322266af4150b8fa30503380ea2725f36f5..23fe8a3f774c44e24bc9c4848069c878a2157098 100644

--- a/chrome/browser/history/web_history_service.cc

+++ b/chrome/browser/history/web_history_service.cc

@@ -10,7 +10,8 @@

#include "base/strings/string_number_conversions.h"

#include "base/values.h"

#include "chrome/browser/signin/oauth2_token_service.h"

-#include "chrome/browser/signin/oauth2_token_service_factory.h"

+#include "chrome/browser/signin/profile_oauth2_token_service.h"

+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

#include "google_apis/gaia/gaia_urls.h"

#include "google_apis/gaia/google_service_auth_error.h"

#include "googleurl/src/gurl.h"

@@ -71,8 +72,8 @@ class RequestImpl : public WebHistoryService::Request,

OAuth2TokenService::ScopeSet oauth_scopes;

oauth_scopes.insert(kHistoryOAuthScope);

- OAuth2TokenService* token_service =

- OAuth2TokenServiceFactory::GetForProfile(profile_);

+ ProfileOAuth2TokenService* token_service =

+ ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);

token_request_ = token_service->StartRequest(oauth_scopes, this);

}