Handle notification preferences intent from gear icon.

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 "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "base/pickle.h"
@@ skipping 213 matching lines @@
     return;
 
   ProfileNotification* profile_notification =
       new ProfileNotification(profile, notification);
 
   // Takes ownership of |profile_notification|.
   AddProfileNotification(profile_notification);
 
   JNIEnv* env = AttachCurrentThread();
 
+  ScopedJavaLocalRef<jstring> tag = ConvertUTF16ToJavaString(
+      env, profile_notification->notification().replace_id());
   ScopedJavaLocalRef<jstring> id = ConvertUTF8ToJavaString(
       env, profile_notification->notification().id());
   ScopedJavaLocalRef<jstring> title = ConvertUTF16ToJavaString(
       env, notification.title());
   ScopedJavaLocalRef<jstring> body = ConvertUTF16ToJavaString(
       env, notification.message());
   ScopedJavaLocalRef<jstring> origin = ConvertUTF8ToJavaString(
       env, notification.origin_url().GetOrigin().spec());
 
   ScopedJavaLocalRef<jobject> icon;
@@ skipping 16 matching lines @@
           "Unable to serialize the notification, payload too large (max 1MB).";
       RemoveProfileNotification(profile_notification);
       return;
     }
 
     notification_data = base::android::ToJavaByteArray(
         env, static_cast<const uint8*>(pickle->data()), pickle->size());
   }
 
   int platform_id = Java_NotificationUIManager_displayNotification(
-      env, java_object_.obj(), id.obj(), title.obj(), body.obj(), icon.obj(),
-      origin.obj(), notification_data.obj());
+      env, java_object_.obj(), tag.obj(), id.obj(), title.obj(), body.obj(),
+      icon.obj(), origin.obj(), notification_data.obj());
 
   std::string notification_id = profile_notification->notification().id();
   platform_notifications_[notification_id] = platform_id;
 
   notification.delegate()->Display();
 }
 
 bool NotificationUIManagerAndroid::Update(const Notification& notification,
                                           Profile* profile) {
   const base::string16& replace_id = notification.replace_id();
@@ skipping 124 matching lines @@
 
 void NotificationUIManagerAndroid::PlatformCloseNotification(
     const std::string& notification_id) {
   auto iterator = platform_notifications_.find(notification_id);
   if (iterator == platform_notifications_.end())
     return;
 
   int platform_id = iterator->second;
   platform_notifications_.erase(notification_id);
 
-  Java_NotificationUIManager_closeNotification(AttachCurrentThread(),
-                                               java_object_.obj(),
-                                               platform_id);
+  ProfileNotification* profile_notification =
+      FindProfileNotification(notification_id);
+  if (!profile_notification)
+    return;

[Peter Beverloo, 2015/02/24 17:48:03]

We don't add the notification to profile_notifications_ when a notification is
being received without Chrome running (the OnNotificationClicked case), so we'd
bail out and would be unable to close the notification here.

[Michael van Ouwerkerk, 2015/02/25 18:12:45]

Done.

+
+  JNIEnv* env = AttachCurrentThread();
+
+  ScopedJavaLocalRef<jstring> tag = ConvertUTF16ToJavaString(
+      env, profile_notification->notification().replace_id());
+  ScopedJavaLocalRef<jstring> origin = ConvertUTF8ToJavaString(
+      env, profile_notification->notification().origin_url().spec());
+
+  Java_NotificationUIManager_closeNotification(
+      env, java_object_.obj(), tag.obj(), platform_id, origin.obj());
 }
 
 void NotificationUIManagerAndroid::AddProfileNotification(
     ProfileNotification* profile_notification) {
   std::string id = profile_notification->notification().id();
 
   // Notification ids should be unique.
   DCHECK(profile_notifications_.find(id) == profile_notifications_.end());
 
   profile_notifications_[id] = profile_notification;
@@ skipping 10 matching lines @@
 
 ProfileNotification* NotificationUIManagerAndroid::FindProfileNotification(
     const std::string& id) const {
   auto iter = profile_notifications_.find(id);
   if (iter == profile_notifications_.end())
     return nullptr;
 
   return iter->second;
 }