Move NotificationDelegate into message_center.

ui/message_center/notification.cc

 // Copyright (c) 2013 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 "ui/message_center/notification.h"
 
 #include "base/logging.h"
 #include "ui/message_center/notification_types.h"
 
 namespace {
@@ skipping 11 matching lines @@
 ButtonInfo::ButtonInfo(const string16& title)
  : title(title) {
 }
 
 Notification::Notification(NotificationType type,
                            const std::string& id,
                            const string16& title,
                            const string16& message,
                            const string16& display_source,
                            const std::string& extension_id,
-                           const DictionaryValue* optional_fields)
- : type_(type),
-   id_(id),
-   title_(title),
-   message_(message),
-   display_source_(display_source),
-   extension_id_(extension_id),
-   priority_(DEFAULT_PRIORITY),
-   timestamp_(base::Time::Now()),
-   serial_number_(g_next_serial_number_++),
-   shown_as_popup_(false),
-   is_read_(false),
-   is_expanded_(false),
-   never_timeout_(false) {
+                           const DictionaryValue* optional_fields,
+                           NotificationDelegate* delegate)
+    : type_(type),
+      id_(id),
+      title_(title),
+      message_(message),
+      display_source_(display_source),
+      extension_id_(extension_id),
+      priority_(DEFAULT_PRIORITY),
+      timestamp_(base::Time::Now()),
+      serial_number_(g_next_serial_number_++),
+      shown_as_popup_(false),
+      is_read_(false),
+      is_expanded_(false),
+      never_timeout_(false),
+      delegate_(delegate) {
   // This can override some data members initialized to deafule values above.
   ApplyOptionalFields(optional_fields);
 }
 
 Notification::~Notification() {
 }
 
 void Notification::CopyState(Notification* base) {
   shown_as_popup_ = base->shown_as_popup();
   is_read_ = base->is_read();
   is_expanded_ = base->is_expanded();
   never_timeout_ = base->never_timeout();
+  delegate_ = base->delegate();

[Jun Mukai, 2013/05/22 23:08:30]

Does this really work well with updating of webkit notifications?

IIRC, each webkit notification function call creates a different delegate, so
the update will point to a new delegate.

[dewittj, 2013/05/24 01:03:51]

Done.

 }
 
 bool Notification::SetButtonIcon(size_t index, const gfx::Image& icon) {
   if (index >= buttons_.size())
     return false;
   buttons_[index].icon = icon;
   return true;
 }
 
 void Notification::ApplyOptionalFields(const DictionaryValue* fields) {
@@ skipping 31 matching lines @@
       item->GetString(kItemTitleKey, &title);
       item->GetString(kItemMessageKey, &message);
       items_.push_back(NotificationItem(title, message));
     }
   }
 
   fields->GetBoolean(kPrivateNeverTimeoutKey, &never_timeout_);
 }
 
 }  // namespace message_center