Migrate TabControlFeature from 0.5 to 0.6

blimp/client/core/contents/blimp_contents_manager.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_MANAGER_H_
+#define BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_MANAGER_H_
+
+#include "blimp/client/core/contents/blimp_contents_impl.h"
+#include "blimp/client/public/contents/blimp_contents_observer.h"
+
+namespace blimp {
+namespace client {
+
+class BlimpContentsManager {
+ public:
+  BlimpContentsManager();
+  ~BlimpContentsManager();
+
+  std::unique_ptr<BlimpContentsImpl> CreateBlimpContents();
+  BlimpContentsImpl* GetBlimpContents(int id);
+
+ private:
+  class BlimpContentsDeletionObserver : public BlimpContentsObserver {

[David Trainor- moved to gerrit, 2016/08/04 16:21:18]

Leave this in the cc file and surround it with anonymous namespace?

[Menglin, 2016/08/05 02:08:24]

BlimpContentsDeletionObserver doesn't work with anonymous namespace :( I tried,
but all kinds of errors.
http://stackoverflow.com/questions/33267839/how-to-forward-declare-class-whic...

I can move the declaration to cc file and make it a friend of
BlimpContentsManager. And since the declaration is in cc file, it's guaranteed
that no where else can use it. wdyt?

[David Trainor- moved to gerrit, 2016/08/05 16:10:23]

Sorry I suggested that before I wrote my other comment on the other patch and
forgot to delete this one.  Yeah just move this to native and make it a friend
like we discussed in patch 1.  Thanks! :)

[Menglin, 2016/08/05 16:39:01]

Done.

+   public:
+    BlimpContentsDeletionObserver(BlimpContentsManager* blimp_contents_manager,
+                                  BlimpContentsImpl* blimp_contents);
+    ~BlimpContentsDeletionObserver() override;
+
+    void OnContentsDestroyed() override;
+
+    BlimpContentsImpl* blimp_contents() { return contents_; }
+
+   private:
+    // The BlimpContentsManager containing this BlimpContentsDeletionObserver
+    BlimpContentsManager* blimp_contents_manager_;
+
+    // The BlimpContents being tracked by this BlimpContentsDeletionObserver.
+    BlimpContentsImpl* contents_;
+
+    DISALLOW_COPY_AND_ASSIGN(BlimpContentsDeletionObserver);
+  };
+
+  int CreateBlimpContentsId();
+  void EraseObserverFromMap(int id);
+
+  std::map<int, std::unique_ptr<BlimpContentsDeletionObserver>> observer_map_;
+
+  DISALLOW_COPY_AND_ASSIGN(BlimpContentsManager);
+};
+
+}  // namespace client
+}  // namespace blimp
+
+#endif  // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_MANAGER_H_