Chromium Code Reviews| Index: blimp/client/session/blimp_client_session.h |
| diff --git a/blimp/client/session/blimp_client_session.h b/blimp/client/session/blimp_client_session.h |
| index afcfd5333608381a4493e7fa9b6dab51bbe91186..b1e36cff8825637ad0f3ddb4e2a7a0d795ae3412 100644 |
| --- a/blimp/client/session/blimp_client_session.h |
| +++ b/blimp/client/session/blimp_client_session.h |
| @@ -42,16 +42,23 @@ class TabControlFeature; |
| // feature proxies must be interacted with on the UI thread. |
| class BLIMP_CLIENT_EXPORT BlimpClientSession { |
| public: |
| - explicit BlimpClientSession(scoped_ptr<AssignmentSource> assignment_source); |
| + BlimpClientSession(); |
| // Uses the AssignmentSource to get an Assignment and then uses the assignment |
| // configuration to connect to the Blimplet. |
| - void Connect(); |
| + // |token| is the login authentication token to use when querying for an |
| + // assignment. |
| + void Connect(const std::string& token); |
|
Kevin M
2016/02/12 19:45:27
auth_token to distinguish it from other tokens
David Trainor- moved to gerrit
2016/02/17 21:09:48
Done.
|
| TabControlFeature* GetTabControlFeature() const; |
| NavigationFeature* GetNavigationFeature() const; |
| RenderWidgetFeature* GetRenderWidgetFeature() const; |
| + // The AssignmentCallback for when an assignment is ready. This will trigger |
| + // a connection to the engine. |
| + virtual void ConnectWithAssignment(AssignmentSourceResult result, |
| + const Assignment& assignment); |
| + |
| protected: |
| virtual ~BlimpClientSession(); |
| @@ -63,19 +70,15 @@ class BLIMP_CLIENT_EXPORT BlimpClientSession { |
| BlimpMessage::Type type, |
| BlimpMessageProcessor* incoming_processor); |
| - // The AssignmentCallback for when an assignment is ready. This will trigger |
| - // a connection to the engine. |
| - void ConnectWithAssignment(const Assignment& assignment); |
| - |
| - // The AssignmentSource is used when the user of BlimpClientSession calls |
| - // Connect() to get a valid assignment and later connect to the engine. |
| - scoped_ptr<AssignmentSource> assignment_source_; |
| - |
| base::Thread io_thread_; |
| scoped_ptr<TabControlFeature> tab_control_feature_; |
| scoped_ptr<NavigationFeature> navigation_feature_; |
| scoped_ptr<RenderWidgetFeature> render_widget_feature_; |
| + // The AssignmentSource is used when the user of BlimpClientSession calls |
| + // Connect() to get a valid assignment and later connect to the engine. |
| + scoped_ptr<AssignmentSource> assignment_source_; |
| + |
| // Container struct for network components. |
| // Must be deleted on the IO thread. |
| scoped_ptr<ClientNetworkComponents> net_components_; |