| 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 86c3cc8bee4ccca718081e240a4d305612f7e67f..98b12ff6fa12839ed3153ddbf87d2a6859019b3c 100644
|
| --- a/blimp/client/core/blimp_client_context_impl.h
|
| +++ b/blimp/client/core/blimp_client_context_impl.h
|
| @@ -24,6 +24,7 @@ namespace blimp {
|
| namespace client {
|
|
|
| class BlimpContentsManager;
|
| +class TabControlFeature;
|
|
|
| // BlimpClientContextImpl is the implementation of the main context-class for
|
| // the blimp client.
|
| @@ -48,6 +49,8 @@ class BlimpClientContextImpl : public BlimpClientContext,
|
| void OnConnected() override;
|
| void OnDisconnected(int result) override;
|
|
|
| + TabControlFeature* GetTabControlFeature() const;
|
| +
|
| protected:
|
| // Returns the URL to use for connections to the assigner. Used to construct
|
| // the AssignmentSource.
|
| @@ -59,6 +62,8 @@ class BlimpClientContextImpl : public BlimpClientContext,
|
| virtual void ConnectWithAssignment(AssignmentRequestResult result,
|
| const Assignment& assignment);
|
|
|
| + void RegisterFeatures();
|
| +
|
| // Provides functionality from the embedder.
|
| BlimpClientContextDelegate* delegate_ = nullptr;
|
|
|
| @@ -80,6 +85,8 @@ class BlimpClientContextImpl : public BlimpClientContext,
|
|
|
| std::unique_ptr<ThreadPipeManager> thread_pipe_manager_;
|
|
|
| + std::unique_ptr<TabControlFeature> tab_control_feature_;
|
| +
|
| base::WeakPtrFactory<BlimpClientContextImpl> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BlimpClientContextImpl);
|
|
|