Extend notifications.mojom for expandable notifications.

ui/arc/notification/arc_custom_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_custom_notification_item.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 32 matching lines @@
 
  private:
   // The destructor is private since this class is ref-counted.
   ~ArcNotificationDelegate() override {}
 
   ArcCustomNotificationItem* const item_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcNotificationDelegate);
 };
 
+message_center::NotificationExpandState ToNotificationExpandState(

[yoshiki, 2017/03/24 10:47:27]

I think it's enough to use the mojo enum values
(mojom::ArcNotificationExpandState) directly than converting values from mojo to
chrome (messagece_center::NotificationExpandState). We already use mojo values
directly at many places in ui/arc.

If you want to having conversion, we should write typemaps and converter (see.
components/arc/bluetooth/bluetooth_type_converters.cc for example).

+    mojom::ArcNotificationExpandState state) {
+  switch (state) {
+    case mojom::ArcNotificationExpandState::FIXED_SIZE:
+      return message_center::NotificationExpandState::FIXED_SIZE;
+    case mojom::ArcNotificationExpandState::COLLAPSED:
+      return message_center::NotificationExpandState::COLLAPSED;
+    case mojom::ArcNotificationExpandState::EXPANDED:
+      return message_center::NotificationExpandState::EXPANDED;
+    default:
+      NOTREACHED();
+      break;
+  }
+  NOTREACHED();
+  return message_center::NotificationExpandState::FIXED_SIZE;
+}
+
 }  // namespace
 
 ArcCustomNotificationItem::ArcCustomNotificationItem(
     ArcNotificationManager* manager,
     message_center::MessageCenter* message_center,
     const std::string& notification_key,
     const AccountId& profile_id)
     : ArcNotificationItem(manager,
                           message_center,
                           notification_key,
@@ skipping 10 matching lines @@
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(notification_key(), data->key);
 
   if (HasPendingNotification()) {
     CacheArcNotificationData(std::move(data));
     return;
   }
 
   message_center::RichNotificationData rich_data;
   rich_data.pinned = (data->no_clear || data->ongoing_event);
+  rich_data.expand_state = ToNotificationExpandState(data->expand_state);
   rich_data.priority = ConvertAndroidPriority(data->priority);
   if (data->small_icon)
     rich_data.small_image = gfx::Image::CreateFrom1xBitmap(*data->small_icon);
   if (data->accessible_name.has_value())
     rich_data.accessible_name = base::UTF8ToUTF16(*data->accessible_name);
 
   message_center::NotifierId notifier_id(
       message_center::NotifierId::SYSTEM_COMPONENT, kNotifierId);
   notifier_id.profile_id = profile_id().GetUserEmail();
 
   auto notification = base::MakeUnique<message_center::Notification>(
       message_center::NOTIFICATION_TYPE_CUSTOM, notification_id(),
       base::UTF8ToUTF16(data->title), base::UTF8ToUTF16(data->message),
       gfx::Image(),
       base::UTF8ToUTF16("arc"),  // display source
       GURL(),                    // empty origin url, for system component
       notifier_id, rich_data, new ArcNotificationDelegate(this));
   notification->set_timestamp(base::Time::FromJavaTime(data->time));
   SetNotification(std::move(notification));
 
   pinned_ = rich_data.pinned;
+  expand_state_ = rich_data.expand_state;
 
   if (!data->snapshot_image || data->snapshot_image->isNull()) {
     snapshot_ = gfx::ImageSkia();
   } else {
     snapshot_ = gfx::ImageSkia(gfx::ImageSkiaRep(
         *data->snapshot_image, data->snapshot_image_scale));
   }
 
   for (auto& observer : observers_)
     observer.OnItemUpdated();
@@ skipping 16 matching lines @@
 }
 
 void ArcCustomNotificationItem::DecrementWindowRefCount() {
   DCHECK_GT(window_ref_count_, 0);
   --window_ref_count_;
   if (window_ref_count_ == 0)
     manager()->CloseNotificationWindow(notification_key());
 }
 
 }  // namespace arc