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"
+
+namespace blimp {
+namespace client {
+
+class BlimpContentsManager {
+ public:
+  BlimpContentsManager();
+  ~BlimpContentsManager();
+
+  std::unique_ptr<BlimpContentsImpl> CreateBlimpContents();
+  BlimpContentsImpl* GetBlimpContents(int id);
+
+ private:
+  class BlimpContentsDeletionObserver;
+
+  int CreateBlimpContentsId();
+  void EraseObserverFromMap(int id);
+
+  std::map<int, std::unique_ptr<BlimpContentsDeletionObserver>> observer_map_;

[David Trainor- moved to gerrit, 2016/08/03 18:55:43]

Can this just be BlimpContentsObserver?  Then you can remove the class line
above and put the actual class in an anonymous namespace.

[Menglin, 2016/08/03 19:25:48]

There is an existing BlimpContentsObserver
blimp/client/public/contents/blimp_contents_observer.h. You mean that?

[Menglin, 2016/08/03 23:49:59]

Actually as i looked at the code again. I think first I should move the
declaration of BlimpContentsDeletionObserver from blimp_contents_manager.cc to
blimp_contents_manager.h, because BlimpContentsDeletionObserver is an inner
class of BlimpContentsManager. The benefit of being the inner class makes
BlimpContentsDeletionObserver able to access private method
EraseObserverFromMap, which should be private.

And as I move the declaration of BlimpContentsDeletionObserver here, I think
it's ok use BlimpContentsDeletionObserver in the observer_map_, wdyt? The inner
class won't be used by anywhere else since it's private.

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

Hmm maybe put this back in the cc file and make it a friend class if that works?
 Inlining all of this makes it kind of hard to quickly read.

+
+  DISALLOW_COPY_AND_ASSIGN(BlimpContentsManager);
+};
+
+}  // namespace client
+}  // namespace blimp
+
+#endif  // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_MANAGER_H_