Add BlimpView to a Chrome tab when Blimp is enabled.

blimp/client/app/android/blimp_view.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/client/app/android/blimp_view.h"
 
 #include <android/native_window_jni.h>
 
 #include "blimp/client/app/android/blimp_client_session_android.h"
 #include "blimp/client/app/compositor/browser_compositor.h"
 #include "jni/BlimpView_jni.h"
 #include "ui/events/android/motion_event_android.h"
 #include "ui/gfx/geometry/size.h"
 
 using base::android::JavaParamRef;
 
 namespace blimp {
 namespace client {
+namespace app {
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& jobj,
                   const JavaParamRef<jobject>& blimp_client_session,
                   jint real_width,
                   jint real_height,
                   jint width,
                   jint height,
                   jfloat dp_to_px) {
   BlimpClientSession* client_session =
@@ skipping 12 matching lines @@
 // static
 bool BlimpView::RegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 BlimpView::BlimpView(JNIEnv* env,
                      const JavaParamRef<jobject>& jobj,
                      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),
       compositor_(base::MakeUnique<BrowserCompositor>()),
       current_surface_format_(0),
       window_(gfx::kNullAcceleratedWidget),
       weak_ptr_factory_(this) {
   compositor_manager_ = BlimpCompositorManagerAndroid::Create(
       real_size, size, render_widget_feature,
       BrowserCompositor::GetSurfaceManager(),
       BrowserCompositor::GetGpuMemoryBufferManager(),
       base::Bind(&BrowserCompositor::AllocateSurfaceClientId));
@@ skipping 125 matching lines @@
                                pointer1);
 
   return compositor_manager_->OnTouchEvent(event);
 }
 
 void BlimpView::OnSwapBuffersCompleted() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_BlimpView_onSwapBuffersCompleted(env, java_obj_);
 }
 
+}  // namespace app
 }  // namespace client
 }  // namespace blimp