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

Unified Diff: components/arc/arc_bridge_service.cc

Issue 1572483002: Implement OnGetNetworks for net.mojom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove weak_factory_ 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/arc/arc_bridge_service.h ('k') | components/arc/arc_service_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/arc_bridge_service.cc
diff --git a/components/arc/arc_bridge_service.cc b/components/arc/arc_bridge_service.cc
index 62bbcf736f9a65566ad7843792bb2b34e511a7d9..ff6abd72193143c73f0e373b206c35a53d57a674 100644
--- a/components/arc/arc_bridge_service.cc
+++ b/components/arc/arc_bridge_service.cc
@@ -63,6 +63,8 @@ void ArcBridgeService::AddObserver(Observer* observer) {
observer->OnImeInstanceReady();
if (input_instance())
observer->OnInputInstanceReady();
+ if (net_instance())
+ observer->OnNetInstanceReady();
if (notifications_instance())
observer->OnNotificationsInstanceReady();
if (power_instance())
@@ -225,6 +227,30 @@ void ArcBridgeService::CloseIntentHelperChannel() {
FOR_EACH_OBSERVER(Observer, observer_list(), OnIntentHelperInstanceClosed());
}
+void ArcBridgeService::OnNetInstanceReady(NetInstancePtr net_ptr) {
+ DCHECK(CalledOnValidThread());
+ temporary_net_ptr_ = std::move(net_ptr);
+ temporary_net_ptr_.QueryVersion(base::Bind(
+ &ArcBridgeService::OnNetVersionReady, weak_factory_.GetWeakPtr()));
+}
+
+void ArcBridgeService::OnNetVersionReady(int32_t version) {
+ DCHECK(CalledOnValidThread());
+ net_ptr_ = std::move(temporary_net_ptr_);
+ net_ptr_.set_connection_error_handler(base::Bind(
+ &ArcBridgeService::CloseNetChannel, weak_factory_.GetWeakPtr()));
+ FOR_EACH_OBSERVER(Observer, observer_list(), OnNetInstanceReady());
+}
+
+void ArcBridgeService::CloseNetChannel() {
+ DCHECK(CalledOnValidThread());
+ if (!net_ptr_)
+ return;
+
+ net_ptr_.reset();
+ FOR_EACH_OBSERVER(Observer, observer_list(), OnNetInstanceClosed());
+}
+
void ArcBridgeService::OnNotificationsInstanceReady(
NotificationsInstancePtr notifications_ptr) {
DCHECK(CalledOnValidThread());
@@ -357,6 +383,7 @@ void ArcBridgeService::CloseAllChannels() {
CloseImeChannel();
CloseInputChannel();
CloseIntentHelperChannel();
+ CloseNetChannel();
CloseNotificationsChannel();
ClosePowerChannel();
CloseProcessChannel();
« no previous file with comments | « components/arc/arc_bridge_service.h ('k') | components/arc/arc_service_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698