| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ | 5 #ifndef BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ |
| 6 #define BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ | 6 #define BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "base/threading/thread.h" | 14 #include "base/threading/thread.h" |
| 15 #include "blimp/client/core/compositor/blob_image_serialization_processor.h" | 15 #include "blimp/client/core/compositor/blob_image_serialization_processor.h" |
| 16 #include "blimp/client/core/session/assignment_source.h" | 16 #include "blimp/client/core/session/assignment_source.h" |
| 17 #include "blimp/client/core/session/network_event_observer.h" | 17 #include "blimp/client/core/session/network_event_observer.h" |
| 18 #include "blimp/client/public/session/assignment.h" |
| 18 #include "blimp/common/proto/blimp_message.pb.h" | 19 #include "blimp/common/proto/blimp_message.pb.h" |
| 19 #include "blimp/net/blimp_connection_statistics.h" | 20 #include "blimp/net/blimp_connection_statistics.h" |
| 20 #include "blimp/net/blimp_message_processor.h" | 21 #include "blimp/net/blimp_message_processor.h" |
| 21 | 22 |
| 22 namespace net { | 23 namespace net { |
| 23 class IPEndPoint; | 24 class IPEndPoint; |
| 24 } | 25 } |
| 25 | 26 |
| 26 namespace blimp { | 27 namespace blimp { |
| 27 | 28 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 TabControlFeature* GetTabControlFeature() const; | 67 TabControlFeature* GetTabControlFeature() const; |
| 67 NavigationFeature* GetNavigationFeature() const; | 68 NavigationFeature* GetNavigationFeature() const; |
| 68 ImeFeature* GetImeFeature() const; | 69 ImeFeature* GetImeFeature() const; |
| 69 RenderWidgetFeature* GetRenderWidgetFeature() const; | 70 RenderWidgetFeature* GetRenderWidgetFeature() const; |
| 70 SettingsFeature* GetSettingsFeature() const; | 71 SettingsFeature* GetSettingsFeature() const; |
| 71 | 72 |
| 72 BlimpConnectionStatistics* GetBlimpConnectionStatistics() const; | 73 BlimpConnectionStatistics* GetBlimpConnectionStatistics() const; |
| 73 | 74 |
| 74 // The AssignmentCallback for when an assignment is ready. This will trigger | 75 // The AssignmentCallback for when an assignment is ready. This will trigger |
| 75 // a connection to the engine. | 76 // a connection to the engine. |
| 76 virtual void ConnectWithAssignment(AssignmentSource::Result result, | 77 virtual void ConnectWithAssignment(AssignmentRequestResult result, |
| 77 const Assignment& assignment); | 78 const Assignment& assignment); |
| 78 | 79 |
| 79 protected: | 80 protected: |
| 80 ~BlimpClientSession() override; | 81 ~BlimpClientSession() override; |
| 81 | 82 |
| 82 // Notified every time the AssignmentSource returns the result of an attempted | 83 // Notified every time the AssignmentSource returns the result of an attempted |
| 83 // assignment request. | 84 // assignment request. |
| 84 virtual void OnAssignmentConnectionAttempted(AssignmentSource::Result result, | 85 virtual void OnAssignmentConnectionAttempted(AssignmentRequestResult result, |
| 85 const Assignment& assignment); | 86 const Assignment& assignment); |
| 86 | 87 |
| 87 private: | 88 private: |
| 88 void RegisterFeatures(); | 89 void RegisterFeatures(); |
| 89 | 90 |
| 90 // NetworkEventObserver implementation. | 91 // NetworkEventObserver implementation. |
| 91 void OnConnected() override; | 92 void OnConnected() override; |
| 92 void OnDisconnected(int result) override; | 93 void OnDisconnected(int result) override; |
| 93 | 94 |
| 94 // BlobImageSerializationProcessor::ErrorDelegate implementation. | 95 // BlobImageSerializationProcessor::ErrorDelegate implementation. |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 | 128 |
| 128 base::WeakPtrFactory<BlimpClientSession> weak_factory_; | 129 base::WeakPtrFactory<BlimpClientSession> weak_factory_; |
| 129 | 130 |
| 130 DISALLOW_COPY_AND_ASSIGN(BlimpClientSession); | 131 DISALLOW_COPY_AND_ASSIGN(BlimpClientSession); |
| 131 }; | 132 }; |
| 132 | 133 |
| 133 } // namespace client | 134 } // namespace client |
| 134 } // namespace blimp | 135 } // namespace blimp |
| 135 | 136 |
| 136 #endif // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ | 137 #endif // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ |
| OLD | NEW |