Add TabControlFeature to BlimpClientContextImpl

blimp/client/core/contents/blimp_contents_impl.h

 // 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.
 
 #ifndef BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_
 #define BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "blimp/client/core/contents/blimp_navigation_controller_delegate.h"
 #include "blimp/client/core/contents/blimp_navigation_controller_impl.h"
 #include "blimp/client/public/contents/blimp_contents.h"
 #include "url/gurl.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/scoped_java_ref.h"
 #endif  // defined(OS_ANDROID)
 
 namespace blimp {
 namespace client {
 
 #if defined(OS_ANDROID)
 class BlimpContentsImplAndroid;
 #endif  // defined(OS_ANDROID)
 
 class BlimpContentsObserver;
 class BlimpNavigationController;
+class TabControlFeature;
 
 class BlimpContentsImpl : public BlimpContents,
                           public BlimpNavigationControllerDelegate {
  public:
   explicit BlimpContentsImpl(int id);
   ~BlimpContentsImpl() override;
 
 #if defined(OS_ANDROID)
   base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl();
   BlimpContentsImplAndroid* GetBlimpContentsImplAndroid();
 #endif  // defined(OS_ANDROID)
 
   // BlimpContents implementation.
   BlimpNavigationControllerImpl& GetNavigationController() override;
   void AddObserver(BlimpContentsObserver* observer) override;
   void RemoveObserver(BlimpContentsObserver* observer) override;
 
   // Check if some observer is in the observer list.
   bool HasObserver(BlimpContentsObserver* observer);
 
   // BlimpNavigationControllerDelegate implementation.
   void OnNavigationStateChanged() override;
 
+  // Set the pointer to the tab control feature.
+  void SetTabControlFeature(TabControlFeature* tab_control_feature);

[nyquist, 2016/08/16 20:41:04]

seems like this could just be set_tab_control_feature and inlined?

[Menglin, 2016/08/16 21:10:09]

if we pass in the tab control feature in BlimpContentsImpl's constructor, we
don't need this function any more

[nyquist, 2016/08/16 21:41:40]

yeah

[Menglin, 2016/08/17 19:48:46]

Done.

+
+  void SetSizeAndScale(const gfx::Size& size,
+                       float device_pixel_ratio) override;
+
+  // This method is added for testing purpose.
+  TabControlFeature* tab_control_feature() { return tab_control_feature_; }
+
   int id() { return id_; }
 
  private:
   // Handles the back/forward list and loading URLs.
   BlimpNavigationControllerImpl navigation_controller_;
 
   // A list of all the observers of this BlimpContentsImpl.
   base::ObserverList<BlimpContentsObserver> observers_;
 
   // The id is assigned during contents creation. It is used by
   // BlimpContentsManager to control the life time of the its observer.
   int id_;
 
+  // The tab control feature through which the BlimpContentsImpl is able to
+  // set size and scale.
+  TabControlFeature* tab_control_feature_ = nullptr;
+
   DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_