Upstream WebAPK notification related code

chrome/browser/notifications/notification_platform_bridge_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_PLATFORM_BRIDGE_ANDROID_H_
 #define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_PLATFORM_BRIDGE_ANDROID_H_
 
 #include <jni.h>
 #include <stdint.h>
 #include <map>
@@ skipping 23 matching lines @@
 
   // Called by the Java implementation when the notification has been clicked.
   void OnNotificationClicked(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& java_object,
       jlong persistent_notification_id,
       const base::android::JavaParamRef<jstring>& java_origin,
       const base::android::JavaParamRef<jstring>& java_profile_id,
       jboolean incognito,
       const base::android::JavaParamRef<jstring>& java_tag,
+      const base::android::JavaParamRef<jstring>& java_webapk_package,
       jint action_index);
 
   // Called by the Java implementation when the notification has been closed.
   void OnNotificationClosed(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& java_object,
       jlong persistent_notification_id,
       const base::android::JavaParamRef<jstring>& java_origin,
       const base::android::JavaParamRef<jstring>& java_profile_id,
       jboolean incognito,
       const base::android::JavaParamRef<jstring>& java_tag,
       jboolean by_user);
 
   // NotificationPlatformBridge implementation.
   void Display(const std::string& notification_id,
                const std::string& profile_id,
                bool incognito,
                const Notification& notification) override;
   void Close(const std::string& profile_id,
              const std::string& notification_id) override;
   bool GetDisplayed(const std::string& profile_id,
                     bool incognito,
                     std::set<std::string>* notifications) const override;
   bool SupportsNotificationCenter() const override;
 
   static bool RegisterNotificationPlatformBridge(JNIEnv* env);
 
  private:
-  // Pair containing the information necessary in order to enable closing
-  // notifications that were not created by this instance of the manager: the
-  // notification's origin and tag. This list may not contain the notifications
-  // that have not been interacted with since the last restart of Chrome.
-  using RegeneratedNotificationInfo = std::pair<std::string, std::string>;
+  // Contains information necessary in order to enable closing notifications
+  // that were not created by this instance of the manager. This list may not
+  // contain the notifications that have not been interacted with since the last
+  // restart of Chrome.
+  struct RegeneratedNotificationInfo {
+    RegeneratedNotificationInfo();
+    RegeneratedNotificationInfo(const std::string& origin,
+                                const std::string& tag,
+                                const std::string& webapk_package);
+    ~RegeneratedNotificationInfo();
+
+    std::string origin;
+    std::string tag;
+    std::string webapk_package;
+  };
 
   // Mapping of a persistent notification id to renegerated notification info.
   // TODO(peter): Remove this map once notification delegate ids for Web
   // notifications are created by the content/ layer.
   std::map<int64_t, RegeneratedNotificationInfo>
       regenerated_notification_infos_;
 
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationPlatformBridgeAndroid);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_PLATFORM_BRIDGE_ANDROID_H_