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

6	6

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

8 #include "base/metrics/histogram.h"	8 #include "base/metrics/histogram.h"

9 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/chromeos/cros/cros_library.h"	10 #include "chrome/browser/chromeos/cros/cros_library.h"

(...skipping 184 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
195 }	195 }

196	196

197 void OAuth1LoginVerifier::OnMergeSessionFailure(	197 void OAuth1LoginVerifier::OnMergeSessionFailure(

198 const GoogleServiceAuthError& error) {	198 const GoogleServiceAuthError& error) {

199 LOG(ERROR) << "Failed MergeSession request,"	199 LOG(ERROR) << "Failed MergeSession request,"

200 << " error: " << error.state();	200 << " error: " << error.state();

201 OnCookieFetchFailed(error);	201 OnCookieFetchFailed(error);

202 }	202 }

203	203

204 } // namespace chromeos	204 } // namespace chromeos

OLD	NEW