Notifications refactor step 2.

Moved notification_types.* from ui/notifications -> ui/message_center (ui/notifications is removed)

Made message_center::Notification a class rather then a struct. Its lifetime is managed by NotificationList.

Moved UnpackOptionalFields from NotificationList to Notification, it is a private member used in ctor.

Removed 2-level collections (set<list>), now all notifications are stored in a std::list (the ScopedVector didn't work since it can't be sorted)

Use stable sort() to figure out the order of notifications in popups and NotificationCenter.

Changed order of notifications in NotificationListUnittest::MarkSinglePopupAsShown - need mukai@ to verify correctness.

NotificationList::RemoveNotification is now void since its bool result was not used.

In NotificationListUnittest, instead of /gtest.gyp:gtest_main include base.gyp:run_all_unittests to initialize ICU etc.

BUG=174164

Review URL: https://chromiumcodereview.appspot.com/12277024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184581 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/notifications/notification.h b/chrome/browser/notifications/notification.h
index 3feb6f8..c5658a7 100644
--- a/chrome/browser/notifications/notification.h
+++ b/chrome/browser/notifications/notification.h
@@ -15,7 +15,7 @@
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/notifications/notification_types.h"
+#include "ui/message_center/notification_types.h"
 
 // Representation of a notification to be shown to the user.
 // On non-Ash platforms these are rendered as HTML, sometimes described by a
@@ -43,7 +43,7 @@ class Notification {
 
   // Initializes a notification with a given type. Takes ownership of
   // optional_fields.
-  Notification(ui::notifications::NotificationType type,
+  Notification(message_center::NotificationType type,
                const GURL& origin_url,
                const GURL& icon_url,
                const string16& title,
@@ -72,7 +72,7 @@ class Notification {
   // If this is a HTML notification.
   bool is_html() const { return is_html_; }
 
-  ui::notifications::NotificationType type() const {
+  message_center::NotificationType type() const {
     return type_;
   }
 
@@ -118,7 +118,7 @@ class Notification {
   NotificationDelegate* delegate() const { return delegate_.get(); }
 
   // The type of notification we'd like displayed.
-  ui::notifications::NotificationType type_;
+  message_center::NotificationType type_;
 
   // The Origin of the page/worker which created this notification.
   GURL origin_url_;