chrome/browser/chromeos/login/oauth_login_manager.cc - Issue 11991002: Merge 176800

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/chromeos/login/oauth_login_manager.cc

Issue 11991002: Merge 176800 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

Patch Set: Created 7 years, 11 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:

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/chromeos/login/oauth_login_manager.h"	5 #include "chrome/browser/chromeos/login/oauth_login_manager.h"

6	6

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

8 #include "chrome/browser/chromeos/login/oauth1_login_manager.h"	8 #include "chrome/browser/chromeos/login/oauth1_login_manager.h"

9 #include "chrome/browser/chromeos/login/oauth2_login_manager.h"	9 #include "chrome/browser/chromeos/login/oauth2_login_manager.h"

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

(...skipping 28 matching lines...) Expand all Loading...
39 : delegate_(delegate),	39 : delegate_(delegate),

40 user_profile_(NULL),	40 user_profile_(NULL),

41 restore_from_auth_cookies_(false),	41 restore_from_auth_cookies_(false),

42 state_(SESSION_RESTORE_NOT_STARTED) {	42 state_(SESSION_RESTORE_NOT_STARTED) {

43 }	43 }

44	44

45 OAuthLoginManager::~OAuthLoginManager() {	45 OAuthLoginManager::~OAuthLoginManager() {

46 }	46 }

47	47

48 } // namespace chromeos	48 } // namespace chromeos

OLD	NEW