Adding BlimpNavigationController to Tab

blimp/client/core/contents/blimp_contents_impl.cc

 // Copyright 2016 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/core/contents/blimp_contents_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/supports_user_data.h"
 #include "blimp/client/core/contents/tab_control_feature.h"
 #include "blimp/client/public/contents/blimp_contents_observer.h"
@@ skipping 17 matching lines @@
     : navigation_controller_(this, nullptr),
       id_(id),
       tab_control_feature_(tab_control_feature) {}
 
 BlimpContentsImpl::~BlimpContentsImpl() {
   FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, BlimpContentsDying());
 }
 
 #if defined(OS_ANDROID)
 
-base::android::ScopedJavaLocalRef<jobject>
-BlimpContentsImpl::GetJavaBlimpContentsImpl() {
+base::android::ScopedJavaLocalRef<jobject> BlimpContentsImpl::GetJavaObject() {
   return GetBlimpContentsImplAndroid()->GetJavaObject();
 }
 
 BlimpContentsImplAndroid* BlimpContentsImpl::GetBlimpContentsImplAndroid() {
   BlimpContentsImplAndroid* blimp_contents_impl_android =
       static_cast<BlimpContentsImplAndroid*>(
           GetUserData(kBlimpContentsImplAndroidKey));
   if (!blimp_contents_impl_android) {
     blimp_contents_impl_android = new BlimpContentsImplAndroid(this);
     SetUserData(kBlimpContentsImplAndroidKey, blimp_contents_impl_android);
@@ skipping 24 matching lines @@
                     OnNavigationStateChanged());
 }
 
 void BlimpContentsImpl::SetSizeAndScale(const gfx::Size& size,
                                         float device_pixel_ratio) {
   tab_control_feature_->SetSizeAndScale(size, device_pixel_ratio);
 }
 
 }  // namespace client
 }  // namespace blimp