Migrate TabControlFeature from 0.5 to 0.6

blimp/client/public/contents/blimp_contents_observer.h

Index: blimp/client/public/contents/blimp_contents_observer.h
diff --git a/blimp/client/public/contents/blimp_contents_observer.h b/blimp/client/public/contents/blimp_contents_observer.h
index dc3e1ec892ab03b6ee1fe4453337a05608e487b9..92a72046788a5d05d46755327b9601bf1217676a 100644
--- a/blimp/client/public/contents/blimp_contents_observer.h
+++ b/blimp/client/public/contents/blimp_contents_observer.h
@@ -15,15 +15,24 @@ namespace client {
 // related to BlimpContents.
 class BlimpContentsObserver {
  public:
-  virtual ~BlimpContentsObserver() = default;
+  virtual ~BlimpContentsObserver();
 
   // Invoked when the navigation state of the BlimpContents has changed.
   virtual void OnNavigationStateChanged() {}
 
+  // Invoked when the blimp contents is destroyed.
+  virtual void OnContentsDestroyed();
+
+  BlimpContents* blimp_contents() { return contents_; }
+
  protected:
-  BlimpContentsObserver() {}
+  explicit BlimpContentsObserver(BlimpContents* blimp_contents);
+  void ClearBlimpContents();

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

Could you explain what this is for and why this is not just inlined in the
destructor?

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

yeah please see my other comment

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

Done.

 
  private:
+  // The BlimpContents being tracked by this BlimpContentsObserver.
+  BlimpContents* contents_;
+
   DISALLOW_COPY_AND_ASSIGN(BlimpContentsObserver);
 };