Migrate TabControlFeature from 0.5 to 0.6

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"
@@ skipping 13 matching lines @@
 #endif  // defined(OS_ANDROID)
 
 class BlimpContentsObserver;
 class BlimpNavigationController;
 
 // BlimpContentsImpl is the implementation of the core class in
 // //blimp/client/core, the BlimpContents.
 class BlimpContentsImpl : public BlimpContents,
                           public BlimpNavigationControllerDelegate {
  public:
-  BlimpContentsImpl();
+  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;
 
   // BlimpNavigationControllerDelegate implementation.
   void NotifyURLLoaded(const GURL& url) override;
 
+  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_;
 
-  DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl);
+  int id_;
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(BlimpContentsImpl);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_