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

Side by Side Diff: content/browser/android/content_view_core_impl.h

Issue 353163002: [Android] Switch to Gin Java Bridge implementation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed AwSettingsTest#testBlockNetworkLoadsWithAudio Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 10 matching lines...) Expand all
21 #include "ui/gfx/rect.h" 21 #include "ui/gfx/rect.h"
22 #include "ui/gfx/rect_f.h" 22 #include "ui/gfx/rect_f.h"
23 #include "url/gurl.h" 23 #include "url/gurl.h"
24 24
25 namespace ui { 25 namespace ui {
26 class ViewAndroid; 26 class ViewAndroid;
27 class WindowAndroid; 27 class WindowAndroid;
28 } 28 }
29 29
30 namespace content { 30 namespace content {
31 class JavaBridgeDispatcherHostManager; 31 class GinJavaBridgeDispatcherHost;
32 class RenderWidgetHostViewAndroid; 32 class RenderWidgetHostViewAndroid;
33 struct MenuItem; 33 struct MenuItem;
34 34
35 // TODO(jrg): this is a shell. Upstream the rest. 35 // TODO(jrg): this is a shell. Upstream the rest.
36 class ContentViewCoreImpl : public ContentViewCore, 36 class ContentViewCoreImpl : public ContentViewCore,
37 public WebContentsObserver { 37 public WebContentsObserver {
38 public: 38 public:
39 static ContentViewCoreImpl* FromWebContents(WebContents* web_contents); 39 static ContentViewCoreImpl* FromWebContents(WebContents* web_contents);
40 ContentViewCoreImpl(JNIEnv* env, 40 ContentViewCoreImpl(JNIEnv* env,
41 jobject obj, 41 jobject obj,
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 // The owning window that has a hold of main application activity. 389 // The owning window that has a hold of main application activity.
390 ui::WindowAndroid* window_android_; 390 ui::WindowAndroid* window_android_;
391 391
392 // The cache of device's current orientation set from Java side, this value 392 // The cache of device's current orientation set from Java side, this value
393 // will be sent to Renderer once it is ready. 393 // will be sent to Renderer once it is ready.
394 int device_orientation_; 394 int device_orientation_;
395 395
396 bool accessibility_enabled_; 396 bool accessibility_enabled_;
397 397
398 // Manages injecting Java objects. 398 // Manages injecting Java objects.
399 scoped_ptr<JavaBridgeDispatcherHostManager> 399 scoped_ptr<GinJavaBridgeDispatcherHost>
400 java_bridge_dispatcher_host_manager_; 400 java_bridge_dispatcher_host_;
401 401
402 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 402 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
403 }; 403 };
404 404
405 bool RegisterContentViewCore(JNIEnv* env); 405 bool RegisterContentViewCore(JNIEnv* env);
406 406
407 } // namespace content 407 } // namespace content
408 408
409 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 409 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698