arc: Show custom notification via notification surface

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 "ash/shell.h"
 #include "ash/system/toast/toast_manager.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
+#include "ui/arc/notification/arc_custom_notification_item.h"
 #include "ui/arc/notification/arc_notification_item.h"
 
 namespace arc {
 
+// Whether to use custom notification.
+constexpr bool use_custom_notification = true;

[yoshiki, 2016/06/16 02:44:50]

We use custom notification only for non-standard notification (+ standard music
controller notification). We need to pass the flag from Android via mojo IPC,
instead of static flag.

Or, perhaps, has the UX design plan been changed?

[xiyuan, 2016/06/20 23:04:58]

Added a use_custom_notification field to notifications.mojom and use it to
choose whether to use custom notifications.

We can revisit this of whether we want to use it for all after the initial CL is
in.

+
 ArcNotificationManager::ArcNotificationManager(ArcBridgeService* bridge_service,
                                                const AccountId& main_profile_id)
     : ArcNotificationManager(bridge_service,
                              main_profile_id,
                              message_center::MessageCenter::Get()) {}
 
 ArcNotificationManager::ArcNotificationManager(
     ArcBridgeService* bridge_service,
     const AccountId& main_profile_id,
     message_center::MessageCenter* message_center)
@@ skipping 30 matching lines @@
     item->OnClosedFromAndroid(false /* by_user */);
   }
   ready_ = false;
 }
 
 void ArcNotificationManager::OnNotificationPosted(
     mojom::ArcNotificationDataPtr data) {
   const std::string& key = data->key;
   auto it = items_.find(key);
   if (it == items_.end()) {
-    // Show a notification on the primary loged-in user's desktop.
+    // Show a notification on the primary logged-in user's desktop.
     // TODO(yoshiki): Reconsider when ARC supports multi-user.
     ArcNotificationItem* item =
-        new ArcNotificationItem(this, message_center_, key, main_profile_id_);
+        use_custom_notification
+            ? new ArcCustomNotificationItem(this, message_center_, key,
+                                            main_profile_id_)
+            : new ArcNotificationItem(this, message_center_, key,
+                                      main_profile_id_);
     // TODO(yoshiki): Use emplacement for performance when it's available.
     auto result = items_.insert(std::make_pair(key, base::WrapUnique(item)));
     DCHECK(result.second);
     it = result.first;
   }
   it->second->UpdateWithArcNotificationData(*data);
 }
 
 void ArcNotificationManager::OnNotificationRemoved(const mojo::String& key) {
   auto it = items_.find(key.get());
@@ skipping 102 matching lines @@
 void ArcNotificationManager::OnToastPosted(mojom::ArcToastDataPtr data) {
   ash::Shell::GetInstance()->toast_manager()->Show(
       ash::ToastData(data->id, data->text, data->duration, data->dismiss_text));
 }
 
 void ArcNotificationManager::OnToastCancelled(mojom::ArcToastDataPtr data) {
   ash::Shell::GetInstance()->toast_manager()->Cancel(data->id);
 }
 
 }  // namespace arc