Migrate TabControlFeature from 0.5 to 0.6

blimp/client/public/contents/blimp_contents_observer.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_PUBLIC_CONTENTS_BLIMP_CONTENTS_OBSERVER_H_
 #define BLIMP_CLIENT_PUBLIC_CONTENTS_BLIMP_CONTENTS_OBSERVER_H_
 
 #include "base/macros.h"
 #include "url/gurl.h"
 
 namespace blimp {
 namespace client {
 
 // An observer API implemented by classes which are interested in various events
 // 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);
+
+  // Can be used by subclass to clear the contents_ to nullptr.
+  void ClearBlimpContents();

[David Trainor- moved to gerrit, 2016/08/06 04:32:58]

See above, now that I think about it this should happen all in the base class
and not require any overriding by the subclasses.

[Menglin, 2016/08/09 00:31:18]

Done.

 
  private:
+  // The BlimpContents being tracked by this BlimpContentsObserver.
+  BlimpContents* contents_;
+
   DISALLOW_COPY_AND_ASSIGN(BlimpContentsObserver);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_PUBLIC_CONTENTS_BLIMP_CONTENTS_OBSERVER_H_