Chromium Code Reviews| Index: blimp/engine/session/blimp_engine_session.h |
| diff --git a/blimp/engine/session/blimp_engine_session.h b/blimp/engine/session/blimp_engine_session.h |
| index c95e02e9823634f8bdad0fc9974b5bf91ca11dc6..d384ee3ee55c8e5c55bf2f3b237e5670ec4a595b 100644 |
| --- a/blimp/engine/session/blimp_engine_session.h |
| +++ b/blimp/engine/session/blimp_engine_session.h |
| @@ -15,6 +15,7 @@ |
| #include "blimp/engine/feature/engine_render_widget_feature.h" |
| #include "blimp/engine/feature/engine_settings_feature.h" |
| #include "blimp/engine/feature/geolocation/engine_geolocation_feature.h" |
| +#include "blimp/engine/mojo/blob_channel_service.h" |
| #include "blimp/net/blimp_message_processor.h" |
| #include "blimp/net/connection_error_observer.h" |
| #include "content/public/browser/invalidate_type.h" |
| @@ -96,6 +97,12 @@ class BlimpEngineSession |
| return blob_channel_sender_.get(); |
| } |
| + BlobChannelService* blob_channel_service() { |
| + return blob_channel_service_.get(); |
| + } |
| + |
| + EngineGeolocationFeature* GetGeolocationFeature(); |
|
Kevin M
2016/07/28 18:14:47
What's this doing here? :)
CJ
2016/07/28 19:54:15
I screwed up merging I think. Fixing.
|
| + |
| // Gets Engine's listening port. Invokes callback with the allocated port. |
| void GetEnginePortForTesting(const GetPortCallback& callback); |
| @@ -201,10 +208,14 @@ class BlimpEngineSession |
| // Sends outgoing blob data as BlimpMessages. |
| HeliumBlobSenderDelegate* blob_delegate_; |
| - // Receives image data from the renderer and sends it to the client via |
| + // Receives image data sends it to the client via |
|
Kevin M
2016/07/28 18:14:47
Doesn't parse?
CJ
2016/07/28 19:54:15
Not sure what you mean. Are you saying that I some
Kevin M
2016/07/28 20:59:17
As in the sentence has two disjoint phrases that d
CJ
2016/07/28 22:47:05
Done.
|
| // |blob_delegate_|. |
| std::unique_ptr<BlobChannelSender> blob_channel_sender_; |
| + // Receives image data from the renderer and sends it to |
| + // |blob_channel_sender_|. |
| + std::unique_ptr<BlobChannelService> blob_channel_service_; |
| + |
| // Handles all incoming and outgoing messages related to Geolocation. |
| EngineGeolocationFeature geolocation_feature_; |