Chromium Code Reviews| Index: content/public/browser/notification_database_data.h |
| diff --git a/content/browser/notifications/notification_database_data.h b/content/public/browser/notification_database_data.h |
| similarity index 60% |
| rename from content/browser/notifications/notification_database_data.h |
| rename to content/public/browser/notification_database_data.h |
| index ea4bf3874fe7624e73de8d3cdd024bd17266ca5e..784cb1c5bc974b858e94823ef17dcc4b357dfdda 100644 |
| --- a/content/browser/notifications/notification_database_data.h |
| +++ b/content/public/browser/notification_database_data.h |
| @@ -2,8 +2,8 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef CONTENT_BROWSER_NOTIFICATIONS_NOTIFICATION_DATABASE_DATA_H_ |
| -#define CONTENT_BROWSER_NOTIFICATIONS_NOTIFICATION_DATABASE_DATA_H_ |
| +#ifndef CONTENT_PUBLIC_BROWSER_NOTIFICATION_DATABASE_DATA_H_ |
| +#define CONTENT_PUBLIC_BROWSER_NOTIFICATION_DATABASE_DATA_H_ |
| #include <stdint.h> |
|
johnme
2015/03/17 12:28:27
Remove
Peter Beverloo
2015/03/17 13:55:31
We use int64_t in this file.
|
| @@ -17,24 +17,14 @@ namespace content { |
| // database. Beyond the notification's own data, its id and attribution need |
| // to be available for users of the database as well. |
| struct CONTENT_EXPORT NotificationDatabaseData { |
|
Peter Beverloo
2015/03/16 18:45:46
The //content API entry points for Web Notificatio
Avi (use Gerrit)
2015/03/16 22:29:50
I'm cool with that.
johnme
2015/03/17 12:28:27
I'm not sure if you still need CONTENT_EXPORT now?
Peter Beverloo
2015/03/17 13:55:31
It compiles and runs fine without it, so let's try
|
| - NotificationDatabaseData(); |
| - ~NotificationDatabaseData(); |
| - |
| - // Parses the serialized notification database data |input| into this object. |
| - bool ParseFromString(const std::string& input); |
| - |
| - // Serializes the contents of this object to |output|. Returns if the data |
| - // could be serialized successfully. |
| - bool SerializeToString(std::string* output) const; |
| - |
| // Id of the notification as allocated by the NotificationDatabase. |
| - int64_t notification_id; |
| + int64_t notification_id = 0; |
|
johnme
2015/03/17 12:28:27
int64 (ditto below)
Peter Beverloo
2015/03/17 13:55:31
No, we use int64_t in Chromium. int64 has been dep
|
| // Origin of the website this notification is associated with. |
| GURL origin; |
| // Id of the Service Worker registration this notification is associated with. |
| - int64_t service_worker_registration_id; |
| + int64_t service_worker_registration_id = 0; |
| // Platform data of the notification that's being stored. |
| PlatformNotificationData notification_data; |
| @@ -42,4 +32,4 @@ struct CONTENT_EXPORT NotificationDatabaseData { |
| } // namespace content |
| -#endif // CONTENT_BROWSER_NOTIFICATIONS_NOTIFICATION_DATABASE_DATA_H_ |
| +#endif // CONTENT_PUBLIC_BROWSER_NOTIFICATION_DATABASE_DATA_H_ |