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

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

Issue 1607603005: Revert of Host-side implementation of ARC Intent handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « components/arc/BUILD.gn ('k') | components/arc/arc_bridge_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 virtual void OnClipboardInstanceClosed() {} 86 virtual void OnClipboardInstanceClosed() {}
87 87
88 // Called whenever the ARC IME interface state changes. 88 // Called whenever the ARC IME interface state changes.
89 virtual void OnImeInstanceReady() {} 89 virtual void OnImeInstanceReady() {}
90 virtual void OnImeInstanceClosed() {} 90 virtual void OnImeInstanceClosed() {}
91 91
92 // Called whenever the ARC input interface state changes. 92 // Called whenever the ARC input interface state changes.
93 virtual void OnInputInstanceReady() {} 93 virtual void OnInputInstanceReady() {}
94 virtual void OnInputInstanceClosed() {} 94 virtual void OnInputInstanceClosed() {}
95 95
96 // Called whenever the ARC intent helper interface state changes.
97 virtual void OnIntentHelperInstanceReady() {}
98 virtual void OnIntentHelperInstanceClosed() {}
99
100 // Called whenever the ARC notification interface state changes. 96 // Called whenever the ARC notification interface state changes.
101 virtual void OnNotificationsInstanceReady() {} 97 virtual void OnNotificationsInstanceReady() {}
102 virtual void OnNotificationsInstanceClosed() {} 98 virtual void OnNotificationsInstanceClosed() {}
103 99
104 // Called whenever the ARC power interface state changes. 100 // Called whenever the ARC power interface state changes.
105 virtual void OnPowerInstanceReady() {} 101 virtual void OnPowerInstanceReady() {}
106 virtual void OnPowerInstanceClosed() {} 102 virtual void OnPowerInstanceClosed() {}
107 103
108 // Called whenever the ARC process interface state changes. 104 // Called whenever the ARC process interface state changes.
109 virtual void OnProcessInstanceReady() {} 105 virtual void OnProcessInstanceReady() {}
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 148
153 // Gets the Mojo interface for all the instance services. This will return 149 // Gets the Mojo interface for all the instance services. This will return
154 // nullptr if that particular service is not ready yet. Use an Observer if 150 // nullptr if that particular service is not ready yet. Use an Observer if
155 // you want to be notified when this is ready. This can only be called on the 151 // you want to be notified when this is ready. This can only be called on the
156 // thread that this class was created on. 152 // thread that this class was created on.
157 AppInstance* app_instance() { return app_ptr_.get(); } 153 AppInstance* app_instance() { return app_ptr_.get(); }
158 AuthInstance* auth_instance() { return auth_ptr_.get(); } 154 AuthInstance* auth_instance() { return auth_ptr_.get(); }
159 ClipboardInstance* clipboard_instance() { return clipboard_ptr_.get(); } 155 ClipboardInstance* clipboard_instance() { return clipboard_ptr_.get(); }
160 ImeInstance* ime_instance() { return ime_ptr_.get(); } 156 ImeInstance* ime_instance() { return ime_ptr_.get(); }
161 InputInstance* input_instance() { return input_ptr_.get(); } 157 InputInstance* input_instance() { return input_ptr_.get(); }
162 IntentHelperInstance* intent_helper_instance() {
163 return intent_helper_ptr_.get();
164 }
165 NotificationsInstance* notifications_instance() { 158 NotificationsInstance* notifications_instance() {
166 return notifications_ptr_.get(); 159 return notifications_ptr_.get();
167 } 160 }
168 PowerInstance* power_instance() { return power_ptr_.get(); } 161 PowerInstance* power_instance() { return power_ptr_.get(); }
169 ProcessInstance* process_instance() { return process_ptr_.get(); } 162 ProcessInstance* process_instance() { return process_ptr_.get(); }
170 SettingsInstance* settings_instance() { return settings_ptr_.get(); } 163 SettingsInstance* settings_instance() { return settings_ptr_.get(); }
171 VideoInstance* video_instance() { return video_ptr_.get(); } 164 VideoInstance* video_instance() { return video_ptr_.get(); }
172 165
173 int32_t app_version() const { return app_ptr_.version(); } 166 int32_t app_version() const { return app_ptr_.version(); }
174 int32_t auth_version() const { return auth_ptr_.version(); } 167 int32_t auth_version() const { return auth_ptr_.version(); }
175 int32_t clipboard_version() const { return clipboard_ptr_.version(); } 168 int32_t clipboard_version() const { return clipboard_ptr_.version(); }
176 int32_t ime_version() const { return ime_ptr_.version(); } 169 int32_t ime_version() const { return ime_ptr_.version(); }
177 int32_t input_version() const { return input_ptr_.version(); } 170 int32_t input_version() const { return input_ptr_.version(); }
178 int32_t intent_helper_version() const { return intent_helper_ptr_.version(); }
179 int32_t notifications_version() const { return notifications_ptr_.version(); } 171 int32_t notifications_version() const { return notifications_ptr_.version(); }
180 int32_t power_version() const { return power_ptr_.version(); } 172 int32_t power_version() const { return power_ptr_.version(); }
181 int32_t process_version() const { return process_ptr_.version(); } 173 int32_t process_version() const { return process_ptr_.version(); }
182 int32_t settings_version() const { return settings_ptr_.version(); } 174 int32_t settings_version() const { return settings_ptr_.version(); }
183 int32_t video_version() const { return video_ptr_.version(); } 175 int32_t video_version() const { return video_ptr_.version(); }
184 176
185 // ArcHost: 177 // ArcHost:
186 void OnAppInstanceReady(AppInstancePtr app_ptr) override; 178 void OnAppInstanceReady(AppInstancePtr app_ptr) override;
187 void OnAuthInstanceReady(AuthInstancePtr auth_ptr) override; 179 void OnAuthInstanceReady(AuthInstancePtr auth_ptr) override;
188 void OnClipboardInstanceReady(ClipboardInstancePtr clipboard_ptr) override; 180 void OnClipboardInstanceReady(ClipboardInstancePtr clipboard_ptr) override;
189 void OnImeInstanceReady(ImeInstancePtr ime_ptr) override; 181 void OnImeInstanceReady(ImeInstancePtr ime_ptr) override;
190 void OnInputInstanceReady(InputInstancePtr input_ptr) override; 182 void OnInputInstanceReady(InputInstancePtr input_ptr) override;
191 void OnIntentHelperInstanceReady(
192 IntentHelperInstancePtr intent_helper_ptr) override;
193 void OnNotificationsInstanceReady( 183 void OnNotificationsInstanceReady(
194 NotificationsInstancePtr notifications_ptr) override; 184 NotificationsInstancePtr notifications_ptr) override;
195 void OnPowerInstanceReady(PowerInstancePtr power_ptr) override; 185 void OnPowerInstanceReady(PowerInstancePtr power_ptr) override;
196 void OnProcessInstanceReady(ProcessInstancePtr process_ptr) override; 186 void OnProcessInstanceReady(ProcessInstancePtr process_ptr) override;
197 void OnSettingsInstanceReady(SettingsInstancePtr process_ptr) override; 187 void OnSettingsInstanceReady(SettingsInstancePtr process_ptr) override;
198 void OnVideoInstanceReady(VideoInstancePtr video_ptr) override; 188 void OnVideoInstanceReady(VideoInstancePtr video_ptr) override;
199 189
200 // Gets the current state of the bridge service. 190 // Gets the current state of the bridge service.
201 State state() const { return state_; } 191 State state() const { return state_; }
202 192
(...skipping 22 matching lines...) Expand all
225 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Prerequisites); 215 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Prerequisites);
226 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, ShutdownMidStartup); 216 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, ShutdownMidStartup);
227 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart); 217 FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart);
228 218
229 // Called when one of the individual channels is closed. 219 // Called when one of the individual channels is closed.
230 void CloseAppChannel(); 220 void CloseAppChannel();
231 void CloseAuthChannel(); 221 void CloseAuthChannel();
232 void CloseClipboardChannel(); 222 void CloseClipboardChannel();
233 void CloseImeChannel(); 223 void CloseImeChannel();
234 void CloseInputChannel(); 224 void CloseInputChannel();
235 void CloseIntentHelperChannel();
236 void CloseNotificationsChannel(); 225 void CloseNotificationsChannel();
237 void ClosePowerChannel(); 226 void ClosePowerChannel();
238 void CloseProcessChannel(); 227 void CloseProcessChannel();
239 void CloseSettingsChannel(); 228 void CloseSettingsChannel();
240 void CloseVideoChannel(); 229 void CloseVideoChannel();
241 230
242 // Callbacks for QueryVersion. 231 // Callbacks for QueryVersion.
243 void OnAppVersionReady(int32_t version); 232 void OnAppVersionReady(int32_t version);
244 void OnAuthVersionReady(int32_t version); 233 void OnAuthVersionReady(int32_t version);
245 void OnClipboardVersionReady(int32_t version); 234 void OnClipboardVersionReady(int32_t version);
246 void OnImeVersionReady(int32_t version); 235 void OnImeVersionReady(int32_t version);
247 void OnInputVersionReady(int32_t version); 236 void OnInputVersionReady(int32_t version);
248 void OnIntentHelperVersionReady(int32_t version);
249 void OnNotificationsVersionReady(int32_t version); 237 void OnNotificationsVersionReady(int32_t version);
250 void OnPowerVersionReady(int32_t version); 238 void OnPowerVersionReady(int32_t version);
251 void OnProcessVersionReady(int32_t version); 239 void OnProcessVersionReady(int32_t version);
252 void OnSettingsVersionReady(int32_t version); 240 void OnSettingsVersionReady(int32_t version);
253 void OnVideoVersionReady(int32_t version); 241 void OnVideoVersionReady(int32_t version);
254 242
255 // Mojo interfaces. 243 // Mojo interfaces.
256 AppInstancePtr app_ptr_; 244 AppInstancePtr app_ptr_;
257 AuthInstancePtr auth_ptr_; 245 AuthInstancePtr auth_ptr_;
258 ClipboardInstancePtr clipboard_ptr_; 246 ClipboardInstancePtr clipboard_ptr_;
259 ImeInstancePtr ime_ptr_; 247 ImeInstancePtr ime_ptr_;
260 InputInstancePtr input_ptr_; 248 InputInstancePtr input_ptr_;
261 IntentHelperInstancePtr intent_helper_ptr_;
262 NotificationsInstancePtr notifications_ptr_; 249 NotificationsInstancePtr notifications_ptr_;
263 PowerInstancePtr power_ptr_; 250 PowerInstancePtr power_ptr_;
264 ProcessInstancePtr process_ptr_; 251 ProcessInstancePtr process_ptr_;
265 SettingsInstancePtr settings_ptr_; 252 SettingsInstancePtr settings_ptr_;
266 VideoInstancePtr video_ptr_; 253 VideoInstancePtr video_ptr_;
267 254
268 // Temporary Mojo interfaces. After a Mojo interface pointer has been 255 // Temporary Mojo interfaces. After a Mojo interface pointer has been
269 // received from the other endpoint, we still need to asynchronously query 256 // 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 257 // its version. While that is going on, we should still return nullptr on
271 // the xxx_instance() functions. 258 // the xxx_instance() functions.
272 // To keep the xxx_instance() functions being trivial, store the instance 259 // To keep the xxx_instance() functions being trivial, store the instance
273 // pointer in a temporary variable to avoid losing its reference. 260 // pointer in a temporary variable to avoid losing its reference.
274 AppInstancePtr temporary_app_ptr_; 261 AppInstancePtr temporary_app_ptr_;
275 AuthInstancePtr temporary_auth_ptr_; 262 AuthInstancePtr temporary_auth_ptr_;
276 ClipboardInstancePtr temporary_clipboard_ptr_; 263 ClipboardInstancePtr temporary_clipboard_ptr_;
277 ImeInstancePtr temporary_ime_ptr_; 264 ImeInstancePtr temporary_ime_ptr_;
278 InputInstancePtr temporary_input_ptr_; 265 InputInstancePtr temporary_input_ptr_;
279 IntentHelperInstancePtr temporary_intent_helper_ptr_;
280 NotificationsInstancePtr temporary_notifications_ptr_; 266 NotificationsInstancePtr temporary_notifications_ptr_;
281 PowerInstancePtr temporary_power_ptr_; 267 PowerInstancePtr temporary_power_ptr_;
282 ProcessInstancePtr temporary_process_ptr_; 268 ProcessInstancePtr temporary_process_ptr_;
283 SettingsInstancePtr temporary_settings_ptr_; 269 SettingsInstancePtr temporary_settings_ptr_;
284 VideoInstancePtr temporary_video_ptr_; 270 VideoInstancePtr temporary_video_ptr_;
285 271
286 base::ObserverList<Observer> observer_list_; 272 base::ObserverList<Observer> observer_list_;
287 273
288 base::ThreadChecker thread_checker_; 274 base::ThreadChecker thread_checker_;
289 275
290 // If the ARC instance service is available. 276 // If the ARC instance service is available.
291 bool available_; 277 bool available_;
292 278
293 // The current state of the bridge. 279 // The current state of the bridge.
294 ArcBridgeService::State state_; 280 ArcBridgeService::State state_;
295 281
296 // WeakPtrFactory to use callbacks. 282 // WeakPtrFactory to use callbacks.
297 base::WeakPtrFactory<ArcBridgeService> weak_factory_; 283 base::WeakPtrFactory<ArcBridgeService> weak_factory_;
298 284
299 DISALLOW_COPY_AND_ASSIGN(ArcBridgeService); 285 DISALLOW_COPY_AND_ASSIGN(ArcBridgeService);
300 }; 286 };
301 287
302 } // namespace arc 288 } // namespace arc
303 289
304 #endif // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_ 290 #endif // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
OLDNEW
« no previous file with comments | « components/arc/BUILD.gn ('k') | components/arc/arc_bridge_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698