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

Unified Diff: components/arc/net/arc_net_host_impl.cc

Issue 2599673005: arc: Use GET_INTERFACE_FOR_METHOD macro (Closed)
Patch Set: Added a conversion I missed Created 3 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
Index: components/arc/net/arc_net_host_impl.cc
diff --git a/components/arc/net/arc_net_host_impl.cc b/components/arc/net/arc_net_host_impl.cc
index fa1f19987aa2e6ba00135c1036a07a728f13137e..c2f14d1586409ddbd12b77e725d0350fb054511f 100644
--- a/components/arc/net/arc_net_host_impl.cc
+++ b/components/arc/net/arc_net_host_impl.cc
@@ -28,9 +28,6 @@
namespace {
constexpr int kGetNetworksListLimit = 100;
-constexpr uint32_t kScanCompletedMinInstanceVersion = 1;
-constexpr uint32_t kDefaultNetworkChangedMinInstanceVersion = 2;
-constexpr uint32_t kWifiEnabledStateChanged = 3;
chromeos::NetworkStateHandler* GetStateHandler() {
return chromeos::NetworkHandler::Get()->network_state_handler();
@@ -307,7 +304,7 @@ void ArcNetHostImpl::OnInstanceReady() {
mojom::NetHostPtr host;
binding_.Bind(MakeRequest(&host));
- auto* instance = arc_bridge_service()->net()->GetInstanceForMethod("Init");
+ auto* instance = GET_INSTANCE_FOR_METHOD(arc_bridge_service()->net(), Init);
DCHECK(instance);
instance->Init(std::move(host));
@@ -587,8 +584,8 @@ void ArcNetHostImpl::StartScan() {
}
void ArcNetHostImpl::ScanCompleted(const chromeos::DeviceState* /*unused*/) {
- auto* net_instance = arc_bridge_service()->net()->GetInstanceForMethod(
- "ScanCompleted", kScanCompletedMinInstanceVersion);
+ auto* net_instance =
+ GET_INSTANCE_FOR_METHOD(arc_bridge_service()->net(), ScanCompleted);
if (!net_instance)
return;
@@ -616,8 +613,8 @@ void ArcNetHostImpl::GetDefaultNetwork(
void ArcNetHostImpl::DefaultNetworkSuccessCallback(
const std::string& service_path,
const base::DictionaryValue& dictionary) {
- auto* net_instance = arc_bridge_service()->net()->GetInstanceForMethod(
- "DefaultNetworkChanged", kDefaultNetworkChangedMinInstanceVersion);
+ auto* net_instance = GET_INSTANCE_FOR_METHOD(arc_bridge_service()->net(),
+ DefaultNetworkChanged);
if (!net_instance)
return;
@@ -629,8 +626,8 @@ void ArcNetHostImpl::DefaultNetworkChanged(
const chromeos::NetworkState* network) {
if (!network) {
VLOG(1) << "No default network";
- auto* net_instance = arc_bridge_service()->net()->GetInstanceForMethod(
- "DefaultNetworkChanged", kDefaultNetworkChangedMinInstanceVersion);
+ auto* net_instance = GET_INSTANCE_FOR_METHOD(arc_bridge_service()->net(),
+ DefaultNetworkChanged);
if (net_instance)
net_instance->DefaultNetworkChanged(nullptr, nullptr);
return;
@@ -646,8 +643,8 @@ void ArcNetHostImpl::DefaultNetworkChanged(
}
void ArcNetHostImpl::DeviceListChanged() {
- auto* net_instance = arc_bridge_service()->net()->GetInstanceForMethod(
- "WifiEnabledStateChanged", kWifiEnabledStateChanged);
+ auto* net_instance = GET_INSTANCE_FOR_METHOD(arc_bridge_service()->net(),
+ WifiEnabledStateChanged);
if (!net_instance)
return;

Powered by Google App Engine
This is Rietveld 408576698