Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: blimp/client/session/blimp_client_session.h

Issue 2249283003: Hooks together Geolocation Feature in the Client and Engine. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lai
Patch Set: Addresses nyquist's #9 comments. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/geolocation/geolocation_feature.h"
16 #include "blimp/client/core/session/assignment_source.h" 17 #include "blimp/client/core/session/assignment_source.h"
17 #include "blimp/client/core/session/network_event_observer.h" 18 #include "blimp/client/core/session/network_event_observer.h"
18 #include "blimp/client/public/session/assignment.h" 19 #include "blimp/client/public/session/assignment.h"
19 #include "blimp/common/proto/blimp_message.pb.h" 20 #include "blimp/common/proto/blimp_message.pb.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
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 97
97 // Receives blob BlimpMessages and relays them to BlobChannelReceiver. 98 // Receives blob BlimpMessages and relays them to BlobChannelReceiver.
98 // Owned by BlobChannelReceiver, therefore stored as a raw pointer here. 99 // Owned by BlobChannelReceiver, therefore stored as a raw pointer here.
99 HeliumBlobReceiverDelegate* blob_delegate_ = nullptr; 100 HeliumBlobReceiverDelegate* blob_delegate_ = nullptr;
100 101
101 // Retrieves and decodes image data from |blob_receiver_|. Must outlive 102 // Retrieves and decodes image data from |blob_receiver_|. Must outlive
102 // |blob_receiver_|. 103 // |blob_receiver_|.
103 BlobImageSerializationProcessor blob_image_processor_; 104 BlobImageSerializationProcessor blob_image_processor_;
104 105
105 std::unique_ptr<BlobChannelReceiver> blob_receiver_; 106 std::unique_ptr<BlobChannelReceiver> blob_receiver_;
107 std::unique_ptr<GeolocationFeature> geolocation_feature_;
106 std::unique_ptr<TabControlFeature> tab_control_feature_; 108 std::unique_ptr<TabControlFeature> tab_control_feature_;
107 std::unique_ptr<NavigationFeature> navigation_feature_; 109 std::unique_ptr<NavigationFeature> navigation_feature_;
108 std::unique_ptr<ImeFeature> ime_feature_; 110 std::unique_ptr<ImeFeature> ime_feature_;
109 std::unique_ptr<RenderWidgetFeature> render_widget_feature_; 111 std::unique_ptr<RenderWidgetFeature> render_widget_feature_;
110 std::unique_ptr<SettingsFeature> settings_feature_; 112 std::unique_ptr<SettingsFeature> settings_feature_;
111 113
112 // The AssignmentSource is used when the user of BlimpClientSession calls 114 // The AssignmentSource is used when the user of BlimpClientSession calls
113 // Connect() to get a valid assignment and later connect to the engine. 115 // Connect() to get a valid assignment and later connect to the engine.
114 std::unique_ptr<AssignmentSource> assignment_source_; 116 std::unique_ptr<AssignmentSource> assignment_source_;
115 117
116 // Container struct for network components. 118 // Container struct for network components.
117 // Must be deleted on the IO thread. 119 // Must be deleted on the IO thread.
118 std::unique_ptr<ClientNetworkComponents> net_components_; 120 std::unique_ptr<ClientNetworkComponents> net_components_;
119 121
120 std::unique_ptr<ThreadPipeManager> thread_pipe_manager_; 122 std::unique_ptr<ThreadPipeManager> thread_pipe_manager_;
121 123
122 base::WeakPtrFactory<BlimpClientSession> weak_factory_; 124 base::WeakPtrFactory<BlimpClientSession> weak_factory_;
123 125
124 DISALLOW_COPY_AND_ASSIGN(BlimpClientSession); 126 DISALLOW_COPY_AND_ASSIGN(BlimpClientSession);
125 }; 127 };
126 128
127 } // namespace client 129 } // namespace client
128 } // namespace blimp 130 } // namespace blimp
129 131
130 #endif // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ 132 #endif // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698