diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /android_webview/native/intercepted_request_data_impl.h | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'android_webview/native/intercepted_request_data_impl.h')
| -rw-r--r-- | android_webview/native/intercepted_request_data_impl.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/android_webview/native/intercepted_request_data_impl.h b/android_webview/native/intercepted_request_data_impl.h index 457bda94b5..598b319321 100644 --- a/android_webview/native/intercepted_request_data_impl.h +++ b/android_webview/native/intercepted_request_data_impl.h @@ -21,13 +21,9 @@ class InterceptedRequestDataImpl : public InterceptedRequestData { InterceptedRequestDataImpl(const base::android::JavaRef<jobject>& obj); virtual ~InterceptedRequestDataImpl(); - virtual scoped_ptr<InputStream> GetInputStream(JNIEnv* env) const; - virtual bool GetMimeType(JNIEnv* env, std::string* mime_type) const; - virtual bool GetCharset(JNIEnv* env, std::string* charset) const; - - virtual net::URLRequestJob* CreateJobFor( - net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE; + virtual scoped_ptr<InputStream> GetInputStream(JNIEnv* env) const OVERRIDE; + virtual bool GetMimeType(JNIEnv* env, std::string* mime_type) const OVERRIDE; + virtual bool GetCharset(JNIEnv* env, std::string* charset) const OVERRIDE; private: base::android::ScopedJavaGlobalRef<jobject> java_object_; |