| 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..9100d704541352bbc67886c156fc6d7dd20f709a 100644
|
| --- a/blimp/client/core/blimp_client_context_impl.h
|
| +++ b/blimp/client/core/blimp_client_context_impl.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/threading/thread.h"
|
| +#include "blimp/client/core/contents/tab_control_feature.h"
|
| #include "blimp/client/core/session/client_network_components.h"
|
| #include "blimp/client/core/session/network_event_observer.h"
|
| #include "blimp/client/public/blimp_client_context.h"
|
| @@ -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);
|
|
|