Merge ArcNotificationItem and ArcCustomNotificationItem

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 <memory>
 #include <utility>
 
 #include "ash/shell.h"
 #include "ash/system/toast/toast_manager.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/arc/arc_bridge_service.h"
-#include "ui/arc/notification/arc_custom_notification_item.h"
-#include "ui/arc/notification/arc_notification_item.h"
+#include "ui/arc/notification/arc_notification_item_impl.h"
 
 namespace arc {
 
 ArcNotificationManager::ArcNotificationManager(ArcBridgeService* bridge_service,
                                                const AccountId& main_profile_id)
     : ArcNotificationManager(bridge_service,
                              main_profile_id,
                              message_center::MessageCenter::Get()) {}
 
 ArcNotificationManager::ArcNotificationManager(
@@ skipping 31 matching lines @@
     item->OnClosedFromAndroid();
   }
   ready_ = false;
 }
 
 void ArcNotificationManager::OnNotificationPosted(
     mojom::ArcNotificationDataPtr data) {
   const std::string& key = data->key;
   auto it = items_.find(key);
   if (it == items_.end()) {
-    // Old client with version < 5 would have use_custom_notification default,
-    // which is false.
-    const bool use_custom_notification = data->use_custom_notification;
     // Show a notification on the primary logged-in user's desktop.
     // TODO(yoshiki): Reconsider when ARC supports multi-user.
-    ArcNotificationItem* item =
-        use_custom_notification
-            ? new ArcCustomNotificationItem(this, message_center_, key,
-                                            main_profile_id_)
-            : new ArcNotificationItem(this, message_center_, key,
-                                      main_profile_id_);
+    auto item = base::MakeUnique<ArcNotificationItemImpl>(
+        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)));
+    auto result = items_.insert(std::make_pair(key, std::move(item)));
     DCHECK(result.second);
     it = result.first;
   }
-  it->second->UpdateWithArcNotificationData(std::move(data));
+  it->second->OnUpdatedFromAndroid(std::move(data));
 }
 
 void ArcNotificationManager::OnNotificationRemoved(const std::string& key) {
   auto it = items_.find(key);
   if (it == items_.end()) {
     VLOG(3) << "Android requests to remove a notification (key: " << key
             << "), but it is already gone.";
     return;
   }
 
@@ skipping 179 matching lines @@
       data->dismiss_text.has_value() ? *data->dismiss_text : std::string()));
   ash::Shell::Get()->toast_manager()->Show(
       ash::ToastData(data->id, text16, data->duration, dismiss_text16));
 }
 
 void ArcNotificationManager::OnToastCancelled(mojom::ArcToastDataPtr data) {
   ash::Shell::Get()->toast_manager()->Cancel(data->id);
 }
 
 }  // namespace arc