Notificaitons refactor step 2

chrome/browser/ui/views/ash/balloon_view_ash.cc

 // 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.
 
 #include "chrome/browser/ui/views/ash/balloon_view_ash.h"
 
 #include "ash/shell.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/notification.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_constants.h"
+#include "ui/message_center/notification_types.h"
 #include "webkit/glue/image_resource_fetcher.h"
 
 namespace {
 
 typedef base::Callback<void(const gfx::ImageSkia&)> SetImageCallback;
 
 const int kPrimaryIconImageSize = 64;
 const int kSecondaryIconImageSize = 15;
 
 // static
@@ skipping 152 matching lines @@
       downloads_.push_back(linked_ptr<ImageDownload>(new ImageDownload(
           notification, notification.icon_url(),
           message_center::kNotificationIconSize,
           base::Bind(&BalloonViewAsh::SetNotificationIcon,
                      base::Unretained(this), notification.notification_id()))));
   }
 
   const base::DictionaryValue* optional_fields = notification.optional_fields();
   if (optional_fields) {
     // Start a download for the notification's image if appropriate.
-    if (optional_fields->HasKey(ui::notifications::kImageUrlKey)) {
+    if (optional_fields->HasKey(message_center::kImageUrlKey)) {
       string16 url;
-      optional_fields->GetString(ui::notifications::kImageUrlKey, &url);
+      optional_fields->GetString(message_center::kImageUrlKey, &url);
       if (!url.empty()) {
         downloads_.push_back(linked_ptr<ImageDownload>(new ImageDownload(
             notification,
             GURL(url),
             message_center::kNotificationPreferredImageSize,
             base::Bind(&BalloonViewAsh::SetNotificationImage,
                        base::Unretained(this),
                        notification.notification_id()))));
       }
     }
 
     // Start a download for the notification's button icons if appropriate.
-    const char* kButtonIconKeys[] = { ui::notifications::kButtonOneIconUrlKey,
-                                      ui::notifications::kButtonTwoIconUrlKey };
+    const char* kButtonIconKeys[] = { message_center::kButtonOneIconUrlKey,
+                                      message_center::kButtonTwoIconUrlKey };
     for (size_t i = 0; i < arraysize(kButtonIconKeys); ++i) {
       if (optional_fields->HasKey(kButtonIconKeys[i])) {
         string16 url;
         optional_fields->GetString(kButtonIconKeys[i], &url);
         if (!url.empty()) {
           downloads_.push_back(linked_ptr<ImageDownload>(new ImageDownload(
               notification,
               GURL(url),
               message_center::kNotificationButtonIconSize,
               base::Bind(&BalloonViewAsh::SetNotificationButtonIcon,
                          base::Unretained(this),
                          notification.notification_id(),
                          i))));
         }
       }
     }
   }
 }