Migrate TabControlFeature from 0.5 to 0.6

blimp/client/core/blimp_client_context_impl.h

Index: blimp/client/core/blimp_client_context_impl.h
diff --git a/blimp/client/core/blimp_client_context_impl.h b/blimp/client/core/blimp_client_context_impl.h
index e108782858c9b464d5829ef7c3cc4413b5ab8a4a..179b74f8b7bbc6c114be58cefe63ac7c757aa9d3 100644
--- a/blimp/client/core/blimp_client_context_impl.h
+++ b/blimp/client/core/blimp_client_context_impl.h
@@ -22,6 +22,12 @@
 namespace blimp {
 namespace client {
 
+class BlimpContentsManager;
+
+#if defined(OS_ANDROID)
+class BlimpClientContextImplAndroid;

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

Is this still necessary?

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

none. deleted it

+#endif  // defined(OS_ANDROID)
+
 // BlimpClientContextImpl is the implementation of the main context-class for
 // the blimp client.
 class BlimpClientContextImpl : public BlimpClientContext,
@@ -52,6 +58,8 @@ class BlimpClientContextImpl : public BlimpClientContext,
   // transferred over network. Owned by ClientNetworkComponents.
   BlimpConnectionStatistics* blimp_connection_statistics_;
 
+  std::unique_ptr<BlimpContentsManager> blimp_contents_manager_;
+
   // Container struct for network components.
   // Must be deleted on the IO thread.
   std::unique_ptr<ClientNetworkComponents> net_components_;