chrome/browser/extensions/api/identity/experimental_identity_api.cc - Issue 57103003: Merge 232631 "This CL broke the official builders."

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/extensions/api/identity/experimental_identity_api.cc

Issue 57103003: Merge 232631 "This CL broke the official builders." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1690/src/

Patch Set: Created 7 years, 1 month ago

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

Jump to:

Index: chrome/browser/extensions/api/identity/experimental_identity_api.cc

===================================================================

--- chrome/browser/extensions/api/identity/experimental_identity_api.cc (revision 232654)

+++ chrome/browser/extensions/api/identity/experimental_identity_api.cc (working copy)

@@ -23,9 +23,9 @@

#include "chrome/common/extensions/api/identity.h"

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

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

+#include "chrome/common/extensions/manifest_handler.h"

#include "chrome/common/url_constants.h"

#include "content/public/common/page_transition_types.h"

-#include "extensions/common/manifest_handler.h"

#include "google_apis/gaia/gaia_constants.h"

#include "ui/base/window_open_disposition.h"

#include "url/gurl.h"

« no previous file with comments | « no previous file | chrome/chrome_common.gypi » ('j') | no next file with comments »