components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.template - Issue 458633002: Merge UrlRequest.java into ChromiumUrlRequest.java

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: components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.template

Issue 458633002: Merge UrlRequest.java into ChromiumUrlRequest.java (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address clm's comments. Created 6 years, 4 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 side-by-side diff with in-line comments

Download patch

« components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java ('K') | « components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java ('k') | components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.template

diff --git a/components/cronet/android/java/src/org/chromium/net/UrlRequestError.template b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.template

similarity index 62%

rename from components/cronet/android/java/src/org/chromium/net/UrlRequestError.template

rename to components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.template

index 85ce7bf0354090ab93691f74ba175c34f3680bf0..24e51102b6bf6a69d9e8ee28f7d537682bad4961 100644

--- a/components/cronet/android/java/src/org/chromium/net/UrlRequestError.template

+++ b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.template

@@ -5,10 +5,10 @@

package org.chromium.net;

// A simple auto-generated interface used to list request errors as used by

-// both org.chromium.net.UrlRequest and

-// net/cronet/android/org_chromium_net_UrlRequest.h

-public interface UrlRequestError {

+// both org.chromium.net.ChromiumUrlRequest and

+// net/cronet/android/chromium_url_request_error_list.h

+public interface ChromiumUrlRequestError {

#define DEFINE_REQUEST_ERROR(x,y) public static final int x = y;

-#include "components/cronet/android/org_chromium_net_UrlRequest_error_list.h"

+#include "components/cronet/android/chromium_url_request_error_list.h"

#undef DEFINE_REQUEST_ERROR

}