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

Unified Diff: blimp/client/app/android/blimp_view.cc

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)
Patch Set: addressed nit, renamed CreateForTesting and piped through touch handling Created 4 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
Index: blimp/client/app/android/blimp_view.cc
diff --git a/blimp/client/app/android/blimp_view.cc b/blimp/client/app/android/blimp_view.cc
index 26755a335a1c9bee6a9826690afb51d77efd7eef..32ed533ef151523e5c6d2c0688f37d6b1aaec571 100644
--- a/blimp/client/app/android/blimp_view.cc
+++ b/blimp/client/app/android/blimp_view.cc
@@ -11,6 +11,7 @@
#include "blimp/client/app/compositor/browser_compositor.h"
#include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
#include "blimp/client/core/compositor/blimp_compositor_manager.h"
+#include "blimp/client/core/render_widget/render_widget_feature.h"
#include "blimp/client/support/compositor/compositor_dependencies_impl.h"
#include "jni/BlimpView_jni.h"
#include "ui/events/android/motion_event_android.h"
@@ -20,6 +21,7 @@ using base::android::JavaParamRef;
namespace blimp {
namespace client {
+namespace app {
static jlong Init(JNIEnv* env,
const JavaParamRef<jobject>& jobj,
@@ -52,7 +54,7 @@ BlimpView::BlimpView(JNIEnv* env,
const gfx::Size& real_size,
const gfx::Size& size,
float dp_to_px,
- RenderWidgetFeature* render_widget_feature)
+ blimp::client::RenderWidgetFeature* render_widget_feature)
: device_scale_factor_(dp_to_px),
current_surface_format_(0),
window_(gfx::kNullAcceleratedWidget),
@@ -207,5 +209,6 @@ void BlimpView::OnSwapBuffersCompleted() {
Java_BlimpView_onSwapBuffersCompleted(env, java_obj_);
}
+} // namespace app
} // namespace client
} // namespace blimp
« no previous file with comments | « blimp/client/app/android/blimp_view.h ('k') | blimp/client/app/android/java/src/org/chromium/blimp/BlimpView.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698