Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3787)

Unified Diff: chrome/browser/extensions/app_notification.cc

Issue 8567018: Limit number of notifications that can be received by the client. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/app_notification.cc
===================================================================
--- chrome/browser/extensions/app_notification.cc (revision 109957)
+++ chrome/browser/extensions/app_notification.cc (working copy)
@@ -4,12 +4,14 @@
#include "chrome/browser/extensions/app_notification.h"
+#include "base/string_number_conversions.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/common/guid.h"
namespace {
const char* kIsLocalKey = "is_local";
+const char* kCreationTime= "creation_time";
const char* kGuidKey = "guid";
const char* kExtensionIdKey = "extension_id";
const char* kTitleKey = "title";
@@ -20,11 +22,13 @@
} // namespace
AppNotification::AppNotification(bool is_local,
+ const base::Time creation_time,
const std::string& guid,
const std::string& extension_id,
const std::string& title,
const std::string& body)
: is_local_(is_local),
+ creation_time_(creation_time),
extension_id_(extension_id),
title_(title),
body_(body) {
@@ -35,7 +39,8 @@
AppNotification* AppNotification::Copy() {
AppNotification* copy = new AppNotification(
- this->is_local(), this->guid(), this->extension_id(),
+ this->is_local(), this->creation_time(),
+ this->guid(), this->extension_id(),
this->title(), this->body());
copy->set_link_url(this->link_url());
copy->set_link_text(this->link_text());
@@ -45,6 +50,9 @@
void AppNotification::ToDictionaryValue(DictionaryValue* result) {
CHECK(result);
result->SetBoolean(kIsLocalKey, is_local_);
+ if (creation_time_.is_null())
asargent_no_longer_on_chrome 2011/11/17 23:40:14 did you mean "if (!creation_time_.is_null())" ?
elvin 2011/11/18 00:10:18 Done.
+ result->SetString(kCreationTime,
+ base::Int64ToString(creation_time_.ToInternalValue()));
if (!guid_.empty())
result->SetString(kGuidKey, guid_);
if (!extension_id_.empty())
@@ -62,12 +70,31 @@
// static
AppNotification* AppNotification::FromDictionaryValue(
const DictionaryValue& value) {
- scoped_ptr<AppNotification> result(new AppNotification(true, "", "", "", ""));
+ scoped_ptr<AppNotification> result(
+ new AppNotification(true,
+ base::Time::FromInternalValue(0), "", "", "", ""));
if (value.HasKey(kIsLocalKey) && !value.GetBoolean(
kIsLocalKey, &result->is_local_)) {
return NULL;
}
+ if (value.HasKey(kCreationTime)) {
+ std::string time_string;
+ if (!value.GetString(kLinkUrlKey, &time_string))
+ return NULL;
+ int64 time_internal;
+ if (!base::StringToInt64(time_string, &time_internal)) {
+ return NULL;
+ }
+ base::Time time = base::Time::FromInternalValue(time_internal);
+ if (time.is_null()) {
+ return NULL;
+ }
+ result->set_creation_time(time);
+ } else {
+ return NULL;
+ }
+
if (value.HasKey(kGuidKey) && !value.GetString(kGuidKey, &result->guid_))
return NULL;
if (value.HasKey(kExtensionIdKey) &&
@@ -96,6 +123,8 @@
bool AppNotification::Equals(const AppNotification& other) const {
return (is_local_ == other.is_local_ &&
+ creation_time_.ToInternalValue() ==
+ other.creation_time_.ToInternalValue() &&
asargent_no_longer_on_chrome 2011/11/17 23:40:14 nit: the Time class has an operator== method, so y
elvin 2011/11/18 00:10:18 Done.
guid_ == other.guid_ &&
extension_id_ == other.extension_id_ &&
title_ == other.title_ &&

Powered by Google App Engine
This is Rietveld 408576698