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

Unified Diff: content/browser/web_contents/web_contents_android.h

Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change loop style Created 4 years, 8 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
Index: content/browser/web_contents/web_contents_android.h
diff --git a/content/browser/web_contents/web_contents_android.h b/content/browser/web_contents/web_contents_android.h
index 0dc47fd58338749780ab32dbad765e27c0387a00..85c22fa83b9caeb34b1e2fdd42de0ea3c2d3b583 100644
--- a/content/browser/web_contents/web_contents_android.h
+++ b/content/browser/web_contents/web_contents_android.h
@@ -21,7 +21,7 @@
namespace content {
class SynchronousCompositorClient;
-class WebContents;
+class WebContentsImpl;
// Android wrapper around WebContents that provides safer passage from java and
// back to native and provides java with a means of communicating with its
@@ -31,10 +31,10 @@ class CONTENT_EXPORT WebContentsAndroid
public:
static bool Register(JNIEnv* env);
- explicit WebContentsAndroid(WebContents* web_contents);
+ explicit WebContentsAndroid(WebContentsImpl* web_contents);
~WebContentsAndroid() override;
- WebContents* web_contents() const { return web_contents_; }
+ WebContentsImpl* web_contents() const { return web_contents_; }
base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
@@ -200,7 +200,7 @@ class CONTENT_EXPORT WebContentsAndroid
const SkBitmap& bitmap,
ReadbackResponse response);
- WebContents* web_contents_;
+ WebContentsImpl* web_contents_;
NavigationControllerAndroid navigation_controller_;
base::android::ScopedJavaGlobalRef<jobject> obj_;
SynchronousCompositorClient* synchronous_compositor_client_;
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/browser/web_contents/web_contents_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698