Notificaitons refactor step 2

ui/message_center/message_center.h

 // Copyright (c) 2012 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 UI_MESSAGE_CENTER_MESSAGE_CENTER_H_
 #define UI_MESSAGE_CENTER_MESSAGE_CENTER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/message_center/message_center_export.h"
 #include "ui/message_center/notification_list.h"
-#include "ui/notifications/notification_types.h"
+#include "ui/message_center/notification_types.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 // Class for managing the NotificationList. The client (e.g. Chrome) calls
 // [Add|Remove|Update]Notification to create and update notifications in the
 // list. It can also implement Delegate to receive callbacks when a
 // notification is removed (closed), or clicked on.
 // If an Observer is provided, it will be informed when the notification list
@@ skipping 73 matching lines @@
   bool HasPopupNotifications() const;
 
   // Adds a new notification. |id| is a unique identifier, used to update or
   // remove notifications. |title| and |meesage| describe the notification text.
   // Use SetNotificationIcon, SetNotificationImage, or SetNotificationButtonIcon
   // to set images. If |extension_id| is provided then 'Disable extension' will
   // appear in a dropdown menu and the id will be used to disable notifications
   // from the extension. Otherwise if |display_source| is provided, a menu item
   // showing the source and allowing notifications from that source to be
   // disabled will be shown. All actual disabling is handled by the Delegate.
-  void AddNotification(ui::notifications::NotificationType type,
+  void AddNotification(NotificationType type,
                        const std::string& id,
                        const string16& title,
                        const string16& message,
                        const string16& display_source,
                        const std::string& extension_id,
                        const base::DictionaryValue* optional_fields);
 
   // Updates an existing notification with id = old_id and set its id to new_id.
   // |optional_fields| can be NULL in case of no updates on those fields.
   void UpdateNotification(const std::string& old_id,
@@ skipping 38 matching lines @@
   scoped_ptr<NotificationList> notification_list_;
   ObserverList<Observer> observer_list_;
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenter);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_MESSAGE_CENTER_H_