Nuke NotificationUIManager from PlatformNotificationServiceImpl

chrome/browser/notifications/notification_ui_manager_android.cc

 // Copyright 2014 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 "chrome/browser/notifications/notification_ui_manager_android.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/android/context_utils.h"
@@ skipping 48 matching lines @@
 
 // Called by the Java side when a notification event has been received, but the
 // NotificationUIManager has not been initialized yet. Enforce initialization of
 // the class.
 static void InitializeNotificationUIManager(JNIEnv* env,
                                             const JavaParamRef<jclass>& clazz) {
   g_browser_process->notification_ui_manager();
 }
 
 // static
-NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) {
+NotificationPlatformBridge* NotificationPlatformBridge::Create() {
   return new NotificationUIManagerAndroid();
 }
 
-// static
-NotificationUIManager*
-NotificationUIManager::CreateNativeNotificationManager() {
-  return nullptr;
-}
-
 NotificationUIManagerAndroid::NotificationUIManagerAndroid() {
   java_object_.Reset(
       Java_NotificationUIManager_create(
           AttachCurrentThread(),
           reinterpret_cast<intptr_t>(this),
           base::android::GetApplicationContext()));
 }
 
 NotificationUIManagerAndroid::~NotificationUIManagerAndroid() {
   Java_NotificationUIManager_destroy(AttachCurrentThread(),
@@ skipping 36 matching lines @@
   std::string tag = ConvertJavaStringToUTF8(env, java_tag);
 
   // The notification was closed by the platform, so clear all local state.
   regenerated_notification_infos_.erase(persistent_notification_id);
   PlatformNotificationServiceImpl::GetInstance()
       ->ProcessPersistentNotificationOperation(
           PlatformNotificationServiceImpl::NOTIFICATION_CLOSE, profile_id,
           incognito, origin, persistent_notification_id, -1);
 }
 
-void NotificationUIManagerAndroid::Add(const Notification& notification,
-                                       Profile* profile) {
-  DCHECK(profile);
+void NotificationUIManagerAndroid::Display(const std::string& notification_id,
+                                           const std::string& profile_id,
+                                           bool incognito,
+                                           const Notification& notification) {
   JNIEnv* env = AttachCurrentThread();
 
   // The Android notification UI manager only supports Web Notifications, which
   // have a PersistentNotificationDelegate. The persistent id of the
   // notification is exposed through it's interface.
   //
   // TODO(peter): When content/ passes a message_center::Notification to the
   // chrome/ layer, the persistent notification id should be captured as a
   // property on that object instead, making this cast unnecessary.
   PersistentNotificationDelegate* delegate =
@@ skipping 27 matching lines @@
     action_titles_vector.push_back(button.title);
   ScopedJavaLocalRef<jobjectArray> action_titles =
       base::android::ToJavaArrayOfStrings(env, action_titles_vector);
 
   ScopedJavaLocalRef<jobjectArray> action_icons =
       ConvertToJavaBitmaps(notification.buttons());
 
   ScopedJavaLocalRef<jintArray> vibration_pattern =
       base::android::ToJavaIntArray(env, notification.vibration_pattern());
 
-  ScopedJavaLocalRef<jstring> profile_id =
-      ConvertUTF8ToJavaString(env, profile->GetPath().BaseName().value());
+  ScopedJavaLocalRef<jstring> j_profile_id =
+      ConvertUTF8ToJavaString(env, profile_id);
 
   Java_NotificationUIManager_displayNotification(
       env, java_object_.obj(), persistent_notification_id, origin.obj(),
-      profile_id.obj(), profile->IsOffTheRecord(), tag.obj(), title.obj(),
-      body.obj(), notification_icon.obj(), badge.obj(), vibration_pattern.obj(),
+      j_profile_id.obj(), incognito, tag.obj(), title.obj(), body.obj(),
+      notification_icon.obj(), badge.obj(), vibration_pattern.obj(),
       notification.timestamp().ToJavaTime(), notification.renotify(),
       notification.silent(), action_titles.obj(), action_icons.obj());
 
   regenerated_notification_infos_[persistent_notification_id] =
       std::make_pair(origin_url.spec(), notification.tag());
 
   notification.delegate()->Display();
 }
 
-bool NotificationUIManagerAndroid::Update(const Notification& notification,
-                                          Profile* profile) {
-  NOTREACHED();
-  return false;
-}
-
-const Notification* NotificationUIManagerAndroid::FindById(
-    const std::string& delegate_id,
-    ProfileID profile_id) const {
-  NOTREACHED();
-  return nullptr;
-}
-
-bool NotificationUIManagerAndroid::CancelById(const std::string& delegate_id,
-                                              ProfileID profile_id) {
+void NotificationUIManagerAndroid::Close(const std::string& profile_id,
+                                         const std::string& notification_id) {
   int64_t persistent_notification_id = 0;
 
   // TODO(peter): Use the |delegate_id| directly when notification ids are being
   // generated by content/ instead of us.
-  if (!base::StringToInt64(delegate_id, &persistent_notification_id))
-    return false;
+  if (!base::StringToInt64(notification_id, &persistent_notification_id)) {
+    LOG(WARNING) << "Unable to decode notification_id " << notification_id;
+    return;
+  }
 
   const auto iterator =
       regenerated_notification_infos_.find(persistent_notification_id);
   if (iterator == regenerated_notification_infos_.end())
-    return false;
+    return;
 
   const RegeneratedNotificationInfo& notification_info = iterator->second;
 
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaLocalRef<jstring> origin =
       ConvertUTF8ToJavaString(env, notification_info.first);
   ScopedJavaLocalRef<jstring> tag =
       ConvertUTF8ToJavaString(env, notification_info.second);
+  ScopedJavaLocalRef<jstring> j_profile_id =
+      ConvertUTF8ToJavaString(env, profile_id);
 
   regenerated_notification_infos_.erase(iterator);
 
-  Java_NotificationUIManager_closeNotification(env,
-                                               java_object_.obj(),
-                                               persistent_notification_id,
-                                               origin.obj(),
-                                               tag.obj());
+  Java_NotificationUIManager_closeNotification(
+      env, java_object_.obj(), j_profile_id.obj(), persistent_notification_id,
+      origin.obj(), tag.obj());
+}
+
+bool NotificationUIManagerAndroid::GetDisplayed(
+    const std::string& profile_id,
+    bool incognito,
+    std::set<std::string>* notifications) const {
+  // TODO(miguelg): This can actually be implemented for M+
+  return false;
+}
+
+bool NotificationUIManagerAndroid::SupportsNotificationCenter() const {
   return true;
 }
 
-std::set<std::string>
-NotificationUIManagerAndroid::GetAllIdsByProfileAndSourceOrigin(
-    ProfileID profile_id,
-    const GURL& source) {
-  NOTREACHED();
-  return std::set<std::string>();
-}
-
-std::set<std::string> NotificationUIManagerAndroid::GetAllIdsByProfile(
-    ProfileID profile_id) {
-  NOTREACHED();
-  return std::set<std::string>();
-}
-
-bool NotificationUIManagerAndroid::CancelAllBySourceOrigin(
-    const GURL& source_origin) {
-  NOTREACHED();
-  return false;
-}
-
-bool NotificationUIManagerAndroid::CancelAllByProfile(ProfileID profile_id) {
-  NOTREACHED();
-  return false;
-}
-
-void NotificationUIManagerAndroid::CancelAll() {
-  NOTREACHED();
-}
-
-bool NotificationUIManagerAndroid::RegisterNotificationUIManager(JNIEnv* env) {
+bool NotificationUIManagerAndroid::RegisterNotificationPlatformBridge(
+    JNIEnv* env) {
   return RegisterNativesImpl(env);
 }