Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: content/browser/web_contents/web_contents_android.h

Issue 1894913002: Android: turn on auto-detect encoding by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 const base::android::JavaParamRef<jobject>& obj, 155 const base::android::JavaParamRef<jobject>& obj,
156 const base::android::JavaParamRef<jobject>& callback); 156 const base::android::JavaParamRef<jobject>& callback);
157 157
158 void ResumeMediaSession(JNIEnv* env, 158 void ResumeMediaSession(JNIEnv* env,
159 const base::android::JavaParamRef<jobject>& obj); 159 const base::android::JavaParamRef<jobject>& obj);
160 void SuspendMediaSession(JNIEnv* env, 160 void SuspendMediaSession(JNIEnv* env,
161 const base::android::JavaParamRef<jobject>& obj); 161 const base::android::JavaParamRef<jobject>& obj);
162 void StopMediaSession(JNIEnv* env, 162 void StopMediaSession(JNIEnv* env,
163 const base::android::JavaParamRef<jobject>& obj); 163 const base::android::JavaParamRef<jobject>& obj);
164 164
165 base::android::ScopedJavaLocalRef<jstring> GetEncoding(
166 JNIEnv* env,
167 const base::android::JavaParamRef<jobject>& obj) const;
168
169 // Relay the access from Java layer to GetScaledContentBitmap through JNI. 165 // Relay the access from Java layer to GetScaledContentBitmap through JNI.
170 void GetContentBitmap(JNIEnv* env, 166 void GetContentBitmap(JNIEnv* env,
171 const base::android::JavaParamRef<jobject>& obj, 167 const base::android::JavaParamRef<jobject>& obj,
172 const base::android::JavaParamRef<jobject>& jcallback, 168 const base::android::JavaParamRef<jobject>& jcallback,
173 const base::android::JavaParamRef<jobject>& color_type, 169 const base::android::JavaParamRef<jobject>& color_type,
174 jfloat scale, 170 jfloat scale,
175 jfloat x, 171 jfloat x,
176 jfloat y, 172 jfloat y,
177 jfloat width, 173 jfloat width,
178 jfloat height); 174 jfloat height);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 SynchronousCompositorClient* synchronous_compositor_client_; 218 SynchronousCompositorClient* synchronous_compositor_client_;
223 219
224 base::WeakPtrFactory<WebContentsAndroid> weak_factory_; 220 base::WeakPtrFactory<WebContentsAndroid> weak_factory_;
225 221
226 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid); 222 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid);
227 }; 223 };
228 224
229 } // namespace content 225 } // namespace content
230 226
231 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 227 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698