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 11 matching lines @@
 #if defined(OS_ANDROID)
 class BlimpContentsImplAndroid;
 #endif  // defined(OS_ANDROID)
 
 class BlimpContentsObserver;
 class BlimpNavigationController;
 
 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 OnNavigationStateChanged() 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_;

[nyquist, 2016/08/05 23:03:22]

Could you explain what this ID is for?

[Menglin, 2016/08/05 23:37:15]

yeah, when a BlimpContentsImpl is destroyed, its BlimpContentsDeletionObserver
is able to retrieve the id, and use that destroy its entry from the
observer_map_. It is used to update the observer_map_

[Menglin, 2016/08/06 00:57:00]

comments added

+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(BlimpContentsImpl);

[nyquist, 2016/08/05 23:03:23]

Is there a reason we can't DISALLOW_COPY_AND_ASSIGN here?

[Menglin, 2016/08/05 23:37:15]

since I removed BlimpContentsImpl(), and I had a compile error if i still use
DISALLOW_COPY_AND_ASSIGN. I searched the error and found an answer suggesting
using this instead

looking at your other comment
https://codereview.chromium.org/2201433002/diff/60001/blimp/client/core/conte...,
should i keep BlimpContentsImpl() ?

[Menglin, 2016/08/06 00:57:00]

Sorry i double checked. there is no problem using DISALLOW_COPY_AND_ASSIGN here

 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_