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

Unified Diff: ui/arc/notification/arc_notification_manager.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: ui/arc/notification/arc_notification_manager.cc
diff --git a/ui/arc/notification/arc_notification_manager.cc b/ui/arc/notification/arc_notification_manager.cc
index aad415f7d56afdba17f188123c7e23dfdd2686e1..8d54ce4fd166ca1a59ecf732e70a0a5927f1c01e 100644
--- a/ui/arc/notification/arc_notification_manager.cc
+++ b/ui/arc/notification/arc_notification_manager.cc
@@ -19,13 +19,6 @@
namespace arc {
-namespace {
-
-// Min version to support Create/CloseNotificationWindow.
-constexpr int kMinVersionNotificationWindow = 7;
-
-} // namespace
-
ArcNotificationManager::ArcNotificationManager(ArcBridgeService* bridge_service,
const AccountId& main_profile_id)
: ArcNotificationManager(bridge_service,
@@ -51,7 +44,7 @@ void ArcNotificationManager::OnInstanceReady() {
DCHECK(!ready_);
auto* notifications_instance =
- arc_bridge_service()->notifications()->GetInstanceForMethod("Init");
+ GET_INSTANCE_FOR_METHOD(arc_bridge_service()->notifications(), Init);
DCHECK(notifications_instance);
notifications_instance->Init(binding_.CreateInterfacePtrAndBind());
@@ -120,9 +113,8 @@ void ArcNotificationManager::SendNotificationRemovedFromChrome(
std::unique_ptr<ArcNotificationItem> item = std::move(it->second);
items_.erase(it);
- auto* notifications_instance =
- arc_bridge_service()->notifications()->GetInstanceForMethod(
- "SendNotificationEventToAndroid");
+ auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+ arc_bridge_service()->notifications(), SendNotificationEventToAndroid);
// On shutdown, the ARC channel may quit earlier then notifications.
if (!notifications_instance) {
@@ -143,9 +135,8 @@ void ArcNotificationManager::SendNotificationClickedOnChrome(
return;
}
- auto* notifications_instance =
- arc_bridge_service()->notifications()->GetInstanceForMethod(
- "SendNotificationEventToAndroid");
+ auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+ arc_bridge_service()->notifications(), SendNotificationEventToAndroid);
// On shutdown, the ARC channel may quit earlier then notifications.
if (!notifications_instance) {
@@ -167,9 +158,8 @@ void ArcNotificationManager::SendNotificationButtonClickedOnChrome(
return;
}
- auto* notifications_instance =
- arc_bridge_service()->notifications()->GetInstanceForMethod(
- "SendNotificationEventToAndroid");
+ auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+ arc_bridge_service()->notifications(), SendNotificationEventToAndroid);
// On shutdown, the ARC channel may quit earlier then notifications.
if (!notifications_instance) {
@@ -211,9 +201,8 @@ void ArcNotificationManager::CreateNotificationWindow(const std::string& key) {
return;
}
- auto* notifications_instance =
- arc_bridge_service()->notifications()->GetInstanceForMethod(
- "CreateNotificationWindow", kMinVersionNotificationWindow);
+ auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+ arc_bridge_service()->notifications(), CreateNotificationWindow);
if (!notifications_instance)
return;
@@ -227,9 +216,8 @@ void ArcNotificationManager::CloseNotificationWindow(const std::string& key) {
return;
}
- auto* notifications_instance =
- arc_bridge_service()->notifications()->GetInstanceForMethod(
- "CloseNotificationWindow", kMinVersionNotificationWindow);
+ auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+ arc_bridge_service()->notifications(), CloseNotificationWindow);
if (!notifications_instance)
return;

Powered by Google App Engine
This is Rietveld 408576698