chrome/browser/extensions/api/identity/identity_api.cc - Issue 12298037: Revert 183123

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: chrome/browser/extensions/api/identity/identity_api.cc

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 years, 10 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 | « chrome/browser/extensions/active_tab_unittest.cc ('k') | chrome/browser/extensions/api/system_indicator/system_indicator_manager.h » ('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) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/extensions/api/identity/identity_api.h"	5 #include "chrome/browser/extensions/api/identity/identity_api.h"

6	6

7 #include "base/lazy_instance.h"	7 #include "base/lazy_instance.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/extensions/extension_function_dispatcher.h"	9 #include "chrome/browser/extensions/extension_function_dispatcher.h"

10 #include "chrome/browser/extensions/extension_install_prompt.h"	10 #include "chrome/browser/extensions/extension_install_prompt.h"

11 #include "chrome/browser/extensions/extension_service.h"	11 #include "chrome/browser/extensions/extension_service.h"

12 #include "chrome/browser/extensions/permissions_updater.h"	12 #include "chrome/browser/extensions/permissions_updater.h"

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

14 #include "chrome/browser/signin/token_service.h"	13 #include "chrome/browser/signin/token_service.h"

15 #include "chrome/browser/signin/token_service_factory.h"	14 #include "chrome/browser/signin/token_service_factory.h"

16 #include "chrome/browser/ui/browser.h"	15 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_navigator.h"	16 #include "chrome/browser/ui/browser_navigator.h"

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

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

20 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"	19 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"

21 #include "chrome/common/extensions/api/experimental_identity.h"	20 #include "chrome/common/extensions/api/experimental_identity.h"

22 #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"	21 #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"

23 #include "chrome/common/extensions/extension.h"	22 #include "chrome/common/extensions/extension.h"

(...skipping 242 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
266	265

267 static base::LazyInstance<ProfileKeyedAPIFactory<IdentityAPI> >	266 static base::LazyInstance<ProfileKeyedAPIFactory<IdentityAPI> >

268 g_factory = LAZY_INSTANCE_INITIALIZER;	267 g_factory = LAZY_INSTANCE_INITIALIZER;

269	268

270 // static	269 // static

271 ProfileKeyedAPIFactory<IdentityAPI>* IdentityAPI::GetFactoryInstance() {	270 ProfileKeyedAPIFactory<IdentityAPI>* IdentityAPI::GetFactoryInstance() {

272 return &g_factory.Get();	271 return &g_factory.Get();

273 }	272 }

274	273

275 } // namespace extensions	274 } // namespace extensions

OLD	NEW