trunk/src/chrome/browser/services/gcm/gcm_profile_service_factory.cc - Issue 281783004: Revert 270226 "Componentize GCM Part 1: create GCM component and..."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: trunk/src/chrome/browser/services/gcm/gcm_profile_service_factory.cc

Issue 281783004: Revert 270226 "Componentize GCM Part 1: create GCM component and..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/chrome/browser/services/gcm/gcm_profile_service_factory.h ('k') | trunk/src/chrome/browser/services/gcm/gcm_profile_service_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"	5 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"

6	6

7 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

8 #include "chrome/browser/profiles/incognito_helpers.h"	8 #include "chrome/browser/profiles/incognito_helpers.h"

9 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

	10 #include "chrome/browser/services/gcm/gcm_client_factory.h"

10 #include "chrome/browser/services/gcm/gcm_profile_service.h"	11 #include "chrome/browser/services/gcm/gcm_profile_service.h"

11 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	12 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

12 #include "chrome/browser/signin/signin_manager_factory.h"	13 #include "chrome/browser/signin/signin_manager_factory.h"

13 #include "components/gcm_driver/gcm_client_factory.h"

14 #include "components/keyed_service/content/browser_context_dependency_manager.h"	14 #include "components/keyed_service/content/browser_context_dependency_manager.h"

15	15

16 #if !defined(OS_ANDROID)	16 #if !defined(OS_ANDROID)

17 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"	17 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"

18 #endif	18 #endif

19	19

20 namespace gcm {	20 namespace gcm {

21	21

22 // static	22 // static

23 GCMProfileService* GCMProfileServiceFactory::GetForProfile(Profile* profile) {	23 GCMProfileService* GCMProfileServiceFactory::GetForProfile(Profile* profile) {

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 service->Initialize(gcm_client_factory.Pass());	56 service->Initialize(gcm_client_factory.Pass());

57 return service;	57 return service;

58 }	58 }

59	59

60 content::BrowserContext* GCMProfileServiceFactory::GetBrowserContextToUse(	60 content::BrowserContext* GCMProfileServiceFactory::GetBrowserContextToUse(

61 content::BrowserContext* context) const {	61 content::BrowserContext* context) const {

62 return chrome::GetBrowserContextOwnInstanceInIncognito(context);	62 return chrome::GetBrowserContextOwnInstanceInIncognito(context);

63 }	63 }

64	64

65 } // namespace gcm	65 } // namespace gcm

OLD	NEW