ARC: Support Android Notification Priority

ui/arc/notification/arc_notification_item.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_item.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/string16.h"
@@ skipping 21 matching lines @@
   DCHECK(base::WorkerPool::RunsTasksOnCurrentThread());
   DCHECK(!data.empty());  // empty string should be handled in caller.
 
   // We may decode an image in the browser process since it has been generated
   // in NotificationListerService in Android and should be safe.
   SkBitmap bitmap;
   gfx::PNGCodec::Decode(&data[0], data.size(), &bitmap);
   return bitmap;
 }
 
+// Convert from Android notification priority to Chrome notification priority.

[hidehiko, 2016/05/01 17:13:36]

nit: s/Convert/Converts/

[yoshiki, 2016/05/02 06:52:47]

Done.

+int convertAndroidPriority(const int androidPriority) {

[hidehiko, 2016/05/01 17:13:35]

nit: s/androidPriority/android_priority/ for chromium style.

[yoshiki, 2016/05/02 06:52:47]

Thanks, I confused. Fixed.

+  switch (androidPriority) {
+    case -2:  // PRIORITY_MIN
+    case -1:  // PRIORITY_LOW
+      return -2;
+    case 0:   // PRIORITY_DEFAULT
+      // Mapped to Chrome's -1, not to pop up the notification.

[hidehiko, 2016/05/01 17:13:36]

How about;

On Android, PRIORITY_DEFAULT does not pop up, so this maps PRIORITY_DEFAULT to
Chrome's -1 to adapt that behavior. Also, this maps PRIORITY_LOW and _HIGH to -2
and 0 respectively to adjust the value with keeping the order among _LOW,
_DEFAULT and _HIGH.

or something in function comment?

[yoshiki, 2016/05/02 06:52:47]

Thank you for suggestion. Done.

+      return -1;
+    case 1:   // PRIORITY_HIGH
+      return 0;
+    case 2:   // PRIORITY_MAX
+      return 2;
+    default:
+      NOTREACHED() << "Invalid Priority";

[hidehiko, 2016/05/01 17:13:35]

nit:

NOTREACHED() << "Invalid Priority: " << android_priority;

would help debugging on some mysterious error case.

[yoshiki, 2016/05/02 06:52:47]

It should be useful. Done.

+      return 0;
+  }
+}
+
 class ArcNotificationDelegate : public message_center::NotificationDelegate {
  public:
   explicit ArcNotificationDelegate(base::WeakPtr<ArcNotificationItem> item)
       : item_(item) {}
 
   void Close(bool by_user) override {
     if (item_)
       item_->Close(by_user);
   }
 
@@ skipping 80 matching lines @@
 
   for (size_t i = 0; i < data.buttons.size(); i++) {
     rich_data.buttons.push_back(message_center::ButtonInfo(
         base::UTF8ToUTF16(data.buttons.at(i)->label.get())));
   }
 
   // If the client is old (version < 1), both |no_clear| and |ongoing_event|
   // are false.
   rich_data.pinned = (data.no_clear || data.ongoing_event);
 
+  rich_data.priority = convertAndroidPriority(data.priority);
+
   // The identifier of the notifier, which is used to distinguish the notifiers
   // in the message center.
   message_center::NotifierId notifier_id(
       message_center::NotifierId::SYSTEM_COMPONENT, kNotifierId);
   notifier_id.profile_id = profile_id_.GetUserEmail();
 
   DCHECK(!data.title.is_null());
   DCHECK(!data.message.is_null());
   notification_.reset(new message_center::Notification(
       type, notification_id_, base::UTF8ToUTF16(data.title.get()),
@@ skipping 56 matching lines @@
   message_center_->AddNotification(std::move(notification_));
 
   if (newer_data_) {
     // There is the newer data, so updates again.
     mojom::ArcNotificationDataPtr data(std::move(newer_data_));
     UpdateWithArcNotificationData(*data);
   }
 }
 
 }  // namespace arc