Support buttons on ARC Notifications

ui/arc/notification/arc_notification_manager.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/arc/notification/arc_notification_manager.h"
 
 #include "base/stl_util.h"
 #include "ui/arc/notification/arc_notification_item.h"
 
 namespace arc {
@@ skipping 38 matching lines @@
                                    data->key, main_profile_id_);
     items_.set(data->key, make_scoped_ptr(item));
   }
   item->UpdateWithArcNotificationData(*data);
 }
 
 void ArcNotificationManager::OnNotificationRemoved(const mojo::String& key) {
   ItemMap::iterator it = items_.find(key.get());
   if (it == items_.end()) {
     VLOG(3) << "Android requests to remove a notification (key: " << key
-            << "), but it is already gone.";
+            << "), but it has already gone.";

[dcheng, 2016/01/26 08:42:08]

Nit: "it is" here and elsewhere is probably more idiomatic english.

     return;
   }
 
   scoped_ptr<ArcNotificationItem> item(items_.take_and_erase(it));
   item->OnClosedFromAndroid();
 }
 
 void ArcNotificationManager::SendNotificationRemovedFromChrome(
     const std::string& key) {
   ItemMap::iterator it = items_.find(key);
   if (it == items_.end()) {
     VLOG(3) << "Chrome requests to remove a notification (key: " << key
-            << "), but it is already gone.";
+            << "), but it has already gone.";
     return;
   }
 
   scoped_ptr<ArcNotificationItem> item(items_.take_and_erase(it));
 
   arc_bridge_->notifications_instance()->SendNotificationEventToAndroid(
       key, ARC_NOTIFICATION_EVENT_CLOSED);
 }
 
 void ArcNotificationManager::SendNotificationClickedOnChrome(
     const std::string& key) {
   if (!items_.contains(key)) {
     VLOG(3) << "Chrome requests to fire a click event on notification (key: "
-            << key << "), but it is gone.";
+            << key << "), but it has gone.";
     return;
   }
 
   arc_bridge_->notifications_instance()->SendNotificationEventToAndroid(
       key, ARC_NOTIFICATION_EVENT_BODY_CLICKED);
 }
 
+void ArcNotificationManager::SendNotificationButtonClickedOnChrome(
+    const std::string& key, int button_index) {
+  if (!items_.contains(key)) {
+    VLOG(3) << "Chrome requests to fire a click event on notification (key: "
+            << key << "), but it has gone.";
+    return;
+  }
+
+  arc::ArcNotificationEvent command;
+  switch (button_index) {
+    case 0:
+      command = ARC_NOTIFICATION_EVENT_BUTTON1_CLICKED;
+      break;
+    case 1:
+      command = ARC_NOTIFICATION_EVENT_BUTTON2_CLICKED;
+      break;
+    case 2:
+      command = ARC_NOTIFICATION_EVENT_BUTTON3_CLICKED;
+      break;
+    case 3:
+      command = ARC_NOTIFICATION_EVENT_BUTTON4_CLICKED;
+      break;
+    case 4:
+      command = ARC_NOTIFICATION_EVENT_BUTTON5_CLICKED;
+      break;
+    default:
+      VLOG(3) << "Invalid button index (key: " << key << ", index: " <<
+          button_index << ").";
+      return;
+  }
+
+  arc_bridge_->notifications_instance()->SendNotificationEventToAndroid(
+      key, command);
+}
+
 }  // namespace arc