| Index: blimp/client/core/session/connection_status.h
|
| diff --git a/blimp/client/core/session/connection_status.h b/blimp/client/core/session/connection_status.h
|
| index 4655e66e442b701feee60082dadd4448afc54ef5..ec23948670dfb823598a44caa3a788a60f9d69a4 100644
|
| --- a/blimp/client/core/session/connection_status.h
|
| +++ b/blimp/client/core/session/connection_status.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/observer_list.h"
|
| #include "blimp/client/core/session/network_event_observer.h"
|
| #include "blimp/client/public/session/assignment.h"
|
| +#include "blimp/common/public/session/assignment_options.h"
|
| #include "net/base/ip_endpoint.h"
|
|
|
| namespace blimp {
|
| @@ -26,7 +27,9 @@ class ConnectionStatus : public NetworkEventObserver {
|
| bool is_connected() const { return is_connected_; }
|
|
|
| // Get engine IP and port.
|
| - const net::IPEndPoint& engine_endpoint() const { return engine_endpoint_; }
|
| + const net::IPEndPoint& engine_endpoint() const {
|
| + return assignment_options_.engine_endpoint;
|
| + }
|
|
|
| // Broadcast network events.
|
| void AddObserver(NetworkEventObserver* observer);
|
| @@ -45,8 +48,8 @@ class ConnectionStatus : public NetworkEventObserver {
|
| // Observers listen to session events.
|
| base::ObserverList<NetworkEventObserver> connection_observers_;
|
|
|
| - // IP address and port of the engine.
|
| - net::IPEndPoint engine_endpoint_;
|
| + // Engine assignment specific to the given transport.
|
| + AssignmentOptions assignment_options_;
|
|
|
| // If the client is currently connected.
|
| bool is_connected_;
|
|
|