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

Side by Side Diff: components/arc/arc_bridge_service.h

Issue 1572483002: Implement OnGetNetworks for net.mojom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + incorporate code review feedback Created 4 years, 11 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 COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_ 5 #ifndef COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
6 #define COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_ 6 #define COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 virtual void OnInputInstanceClosed() {} 94 virtual void OnInputInstanceClosed() {}
95 95
96 // Called whenever the ARC intent helper interface state changes. 96 // Called whenever the ARC intent helper interface state changes.
97 virtual void OnIntentHelperInstanceReady() {} 97 virtual void OnIntentHelperInstanceReady() {}
98 virtual void OnIntentHelperInstanceClosed() {} 98 virtual void OnIntentHelperInstanceClosed() {}
99 99
100 // Called whenever the ARC notification interface state changes. 100 // Called whenever the ARC notification interface state changes.
101 virtual void OnNotificationsInstanceReady() {} 101 virtual void OnNotificationsInstanceReady() {}
102 virtual void OnNotificationsInstanceClosed() {} 102 virtual void OnNotificationsInstanceClosed() {}
103 103
104 // Called whenever the ARC net interface state changes.
105 virtual void OnNetInstanceReady() {}
106 virtual void OnNetInstanceClosed() {}
107
104 // Called whenever the ARC power interface state changes. 108 // Called whenever the ARC power interface state changes.
105 virtual void OnPowerInstanceReady() {} 109 virtual void OnPowerInstanceReady() {}
106 virtual void OnPowerInstanceClosed() {} 110 virtual void OnPowerInstanceClosed() {}
107 111
108 // Called whenever the ARC process interface state changes. 112 // Called whenever the ARC process interface state changes.
109 virtual void OnProcessInstanceReady() {} 113 virtual void OnProcessInstanceReady() {}
110 virtual void OnProcessInstanceClosed() {} 114 virtual void OnProcessInstanceClosed() {}
111 115
112 // Called whenever the ARC settings interface state changes. 116 // Called whenever the ARC settings interface state changes.
113 virtual void OnSettingsInstanceReady() {} 117 virtual void OnSettingsInstanceReady() {}
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 // you want to be notified when this is ready. This can only be called on the 159 // you want to be notified when this is ready. This can only be called on the
156 // thread that this class was created on. 160 // thread that this class was created on.
157 AppInstance* app_instance() { return app_ptr_.get(); } 161 AppInstance* app_instance() { return app_ptr_.get(); }
158 AuthInstance* auth_instance() { return auth_ptr_.get(); } 162 AuthInstance* auth_instance() { return auth_ptr_.get(); }
159 ClipboardInstance* clipboard_instance() { return clipboard_ptr_.get(); } 163 ClipboardInstance* clipboard_instance() { return clipboard_ptr_.get(); }
160 ImeInstance* ime_instance() { return ime_ptr_.get(); } 164 ImeInstance* ime_instance() { return ime_ptr_.get(); }
161 InputInstance* input_instance() { return input_ptr_.get(); } 165 InputInstance* input_instance() { return input_ptr_.get(); }
162 IntentHelperInstance* intent_helper_instance() { 166 IntentHelperInstance* intent_helper_instance() {
163 return intent_helper_ptr_.get(); 167 return intent_helper_ptr_.get();
164 } 168 }
169 NetInstance* net_instance() { return net_ptr_.get(); }
165 NotificationsInstance* notifications_instance() { 170 NotificationsInstance* notifications_instance() {
166 return notifications_ptr_.get(); 171 return notifications_ptr_.get();
167 } 172 }
168 PowerInstance* power_instance() { return power_ptr_.get(); } 173 PowerInstance* power_instance() { return power_ptr_.get(); }
169 ProcessInstance* process_instance() { return process_ptr_.get(); } 174 ProcessInstance* process_instance() { return process_ptr_.get(); }
170 SettingsInstance* settings_instance() { return settings_ptr_.get(); } 175 SettingsInstance* settings_instance() { return settings_ptr_.get(); }
171 VideoInstance* video_instance() { return video_ptr_.get(); } 176 VideoInstance* video_instance() { return video_ptr_.get(); }
172 177
173 int32_t app_version() const { return app_ptr_.version(); } 178 int32_t app_version() const { return app_ptr_.version(); }
174 int32_t auth_version() const { return auth_ptr_.version(); } 179 int32_t auth_version() const { return auth_ptr_.version(); }
175 int32_t clipboard_version() const { return clipboard_ptr_.version(); } 180 int32_t clipboard_version() const { return clipboard_ptr_.version(); }
176 int32_t ime_version() const { return ime_ptr_.version(); } 181 int32_t ime_version() const { return ime_ptr_.version(); }
177 int32_t input_version() const { return input_ptr_.version(); } 182 int32_t input_version() const { return input_ptr_.version(); }
178 int32_t intent_helper_version() const { return intent_helper_ptr_.version(); } 183 int32_t intent_helper_version() const { return intent_helper_ptr_.version(); }
179 int32_t notifications_version() const { return notifications_ptr_.version(); } 184 int32_t notifications_version() const { return notifications_ptr_.version(); }
180 int32_t power_version() const { return power_ptr_.version(); } 185 int32_t power_version() const { return power_ptr_.version(); }
181 int32_t process_version() const { return process_ptr_.version(); } 186 int32_t process_version() const { return process_ptr_.version(); }
182 int32_t settings_version() const { return settings_ptr_.version(); } 187 int32_t settings_version() const { return settings_ptr_.version(); }
183 int32_t video_version() const { return video_ptr_.version(); } 188 int32_t video_version() const { return video_ptr_.version(); }
184 189
185 // ArcHost: 190 // ArcHost:
186 void OnAppInstanceReady(AppInstancePtr app_ptr) override; 191 void OnAppInstanceReady(AppInstancePtr app_ptr) override;
187 void OnAuthInstanceReady(AuthInstancePtr auth_ptr) override; 192 void OnAuthInstanceReady(AuthInstancePtr auth_ptr) override;
188 void OnClipboardInstanceReady(ClipboardInstancePtr clipboard_ptr) override; 193 void OnClipboardInstanceReady(ClipboardInstancePtr clipboard_ptr) override;
189 void OnImeInstanceReady(ImeInstancePtr ime_ptr) override; 194 void OnImeInstanceReady(ImeInstancePtr ime_ptr) override;
190 void OnInputInstanceReady(InputInstancePtr input_ptr) override; 195 void OnInputInstanceReady(InputInstancePtr input_ptr) override;
191 void OnIntentHelperInstanceReady( 196 void OnIntentHelperInstanceReady(
192 IntentHelperInstancePtr intent_helper_ptr) override; 197 IntentHelperInstancePtr intent_helper_ptr) override;
198 void OnNetInstanceReady(NetInstancePtr net_ptr) override;
193 void OnNotificationsInstanceReady( 199 void OnNotificationsInstanceReady(
194 NotificationsInstancePtr notifications_ptr) override; 200 NotificationsInstancePtr notifications_ptr) override;
195 void OnPowerInstanceReady(PowerInstancePtr power_ptr) override; 201 void OnPowerInstanceReady(PowerInstancePtr power_ptr) override;
196 void OnProcessInstanceReady(ProcessInstancePtr process_ptr) override; 202 void OnProcessInstanceReady(ProcessInstancePtr process_ptr) override;
197 void OnSettingsInstanceReady(SettingsInstancePtr process_ptr) override; 203 void OnSettingsInstanceReady(SettingsInstancePtr process_ptr) override;
198 void OnVideoInstanceReady(VideoInstancePtr video_ptr) override; 204 void OnVideoInstanceReady(VideoInstancePtr video_ptr) override;
199 205
200 // Gets the current state of the bridge service. 206 // Gets the current state of the bridge service.
201 State state() const { return state_; } 207 State state() const { return state_; }
202 208
(...skipping 23 matching lines...) Expand all
226 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, ShutdownMidStartup); 232 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, ShutdownMidStartup);
227 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart); 233 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart);
228 234
229 // Called when one of the individual channels is closed. 235 // Called when one of the individual channels is closed.
230 void CloseAppChannel(); 236 void CloseAppChannel();
231 void CloseAuthChannel(); 237 void CloseAuthChannel();
232 void CloseClipboardChannel(); 238 void CloseClipboardChannel();
233 void CloseImeChannel(); 239 void CloseImeChannel();
234 void CloseInputChannel(); 240 void CloseInputChannel();
235 void CloseIntentHelperChannel(); 241 void CloseIntentHelperChannel();
242 void CloseNetChannel();
236 void CloseNotificationsChannel(); 243 void CloseNotificationsChannel();
237 void ClosePowerChannel(); 244 void ClosePowerChannel();
238 void CloseProcessChannel(); 245 void CloseProcessChannel();
239 void CloseSettingsChannel(); 246 void CloseSettingsChannel();
240 void CloseVideoChannel(); 247 void CloseVideoChannel();
241 248
242 // Callbacks for QueryVersion. 249 // Callbacks for QueryVersion.
243 void OnAppVersionReady(int32_t version); 250 void OnAppVersionReady(int32_t version);
244 void OnAuthVersionReady(int32_t version); 251 void OnAuthVersionReady(int32_t version);
245 void OnClipboardVersionReady(int32_t version); 252 void OnClipboardVersionReady(int32_t version);
246 void OnImeVersionReady(int32_t version); 253 void OnImeVersionReady(int32_t version);
247 void OnInputVersionReady(int32_t version); 254 void OnInputVersionReady(int32_t version);
248 void OnIntentHelperVersionReady(int32_t version); 255 void OnIntentHelperVersionReady(int32_t version);
256 void OnNetVersionReady(int32_t version);
249 void OnNotificationsVersionReady(int32_t version); 257 void OnNotificationsVersionReady(int32_t version);
250 void OnPowerVersionReady(int32_t version); 258 void OnPowerVersionReady(int32_t version);
251 void OnProcessVersionReady(int32_t version); 259 void OnProcessVersionReady(int32_t version);
252 void OnSettingsVersionReady(int32_t version); 260 void OnSettingsVersionReady(int32_t version);
253 void OnVideoVersionReady(int32_t version); 261 void OnVideoVersionReady(int32_t version);
254 262
255 // Mojo interfaces. 263 // Mojo interfaces.
256 AppInstancePtr app_ptr_; 264 AppInstancePtr app_ptr_;
257 AuthInstancePtr auth_ptr_; 265 AuthInstancePtr auth_ptr_;
258 ClipboardInstancePtr clipboard_ptr_; 266 ClipboardInstancePtr clipboard_ptr_;
259 ImeInstancePtr ime_ptr_; 267 ImeInstancePtr ime_ptr_;
260 InputInstancePtr input_ptr_; 268 InputInstancePtr input_ptr_;
261 IntentHelperInstancePtr intent_helper_ptr_; 269 IntentHelperInstancePtr intent_helper_ptr_;
270 NetInstancePtr net_ptr_;
262 NotificationsInstancePtr notifications_ptr_; 271 NotificationsInstancePtr notifications_ptr_;
263 PowerInstancePtr power_ptr_; 272 PowerInstancePtr power_ptr_;
264 ProcessInstancePtr process_ptr_; 273 ProcessInstancePtr process_ptr_;
265 SettingsInstancePtr settings_ptr_; 274 SettingsInstancePtr settings_ptr_;
266 VideoInstancePtr video_ptr_; 275 VideoInstancePtr video_ptr_;
267 276
268 // Temporary Mojo interfaces. After a Mojo interface pointer has been 277 // Temporary Mojo interfaces. After a Mojo interface pointer has been
269 // received from the other endpoint, we still need to asynchronously query 278 // received from the other endpoint, we still need to asynchronously query
270 // its version. While that is going on, we should still return nullptr on 279 // its version. While that is going on, we should still return nullptr on
271 // the xxx_instance() functions. 280 // the xxx_instance() functions.
272 // To keep the xxx_instance() functions being trivial, store the instance 281 // To keep the xxx_instance() functions being trivial, store the instance
273 // pointer in a temporary variable to avoid losing its reference. 282 // pointer in a temporary variable to avoid losing its reference.
274 AppInstancePtr temporary_app_ptr_; 283 AppInstancePtr temporary_app_ptr_;
275 AuthInstancePtr temporary_auth_ptr_; 284 AuthInstancePtr temporary_auth_ptr_;
276 ClipboardInstancePtr temporary_clipboard_ptr_; 285 ClipboardInstancePtr temporary_clipboard_ptr_;
277 ImeInstancePtr temporary_ime_ptr_; 286 ImeInstancePtr temporary_ime_ptr_;
278 InputInstancePtr temporary_input_ptr_; 287 InputInstancePtr temporary_input_ptr_;
279 IntentHelperInstancePtr temporary_intent_helper_ptr_; 288 IntentHelperInstancePtr temporary_intent_helper_ptr_;
289 NetInstancePtr temporary_net_ptr_;
280 NotificationsInstancePtr temporary_notifications_ptr_; 290 NotificationsInstancePtr temporary_notifications_ptr_;
281 PowerInstancePtr temporary_power_ptr_; 291 PowerInstancePtr temporary_power_ptr_;
282 ProcessInstancePtr temporary_process_ptr_; 292 ProcessInstancePtr temporary_process_ptr_;
283 SettingsInstancePtr temporary_settings_ptr_; 293 SettingsInstancePtr temporary_settings_ptr_;
284 VideoInstancePtr temporary_video_ptr_; 294 VideoInstancePtr temporary_video_ptr_;
285 295
286 base::ObserverList<Observer> observer_list_; 296 base::ObserverList<Observer> observer_list_;
287 297
288 base::ThreadChecker thread_checker_; 298 base::ThreadChecker thread_checker_;
289 299
290 // If the ARC instance service is available. 300 // If the ARC instance service is available.
291 bool available_; 301 bool available_;
292 302
293 // The current state of the bridge. 303 // The current state of the bridge.
294 ArcBridgeService::State state_; 304 ArcBridgeService::State state_;
295 305
296 // WeakPtrFactory to use callbacks. 306 // WeakPtrFactory to use callbacks.
297 base::WeakPtrFactory<ArcBridgeService> weak_factory_; 307 base::WeakPtrFactory<ArcBridgeService> weak_factory_;
298 308
299 DISALLOW_COPY_AND_ASSIGN(ArcBridgeService); 309 DISALLOW_COPY_AND_ASSIGN(ArcBridgeService);
300 }; 310 };
301 311
302 } // namespace arc 312 } // namespace arc
303 313
304 #endif // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_ 314 #endif // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698