Re-factor Ash Message Center code part 4/4

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/message_center.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/icon_messages.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 "webkit/glue/image_resource_fetcher.h"
 
 namespace {
 
 const int kNotificationIconImageSize = 32;
 
-ash::WebNotificationTray* GetWebNotificationTray() {
-  return ash::Shell::GetInstance()->GetWebNotificationTray();
+message_center::MessageCenter* GetMessageCenter() {
+  return ash::Shell::GetInstance()->GetWebNotificationTray()->message_center();
 }
 
 }  // namespace
 
 class BalloonViewAsh::IconFetcher : public content::WebContentsObserver {
  public:
   IconFetcher(content::WebContents* web_contents,
               const std::string& notification_id,
               const GURL& icon_url)
       : content::WebContentsObserver(web_contents),
@@ skipping 17 matching lines @@
     return message_handled;
   }
 
   void OnDidDownloadFavicon(int id,
                             const GURL& image_url,
                             bool errored,
                             int requested_size,
                             const std::vector<SkBitmap>& bitmaps) {
     if (image_url != icon_url_ || id != request_id_ || bitmaps.empty())
       return;
-    GetWebNotificationTray()->SetNotificationImage(
+    GetMessageCenter()->SetNotificationImage(
         notification_id_, gfx::ImageSkia(bitmaps[0]));
   }
 
  private:
   int request_id_;
   std::string notification_id_;
   GURL icon_url_;
 
   DISALLOW_COPY_AND_ASSIGN(IconFetcher);
 };
 
 BalloonViewAsh::BalloonViewAsh(BalloonCollection* collection)
     : collection_(collection),
       balloon_(NULL) {
 }
 
 BalloonViewAsh::~BalloonViewAsh() {
 }
 
 // BalloonView interface.
 void BalloonViewAsh::Show(Balloon* balloon) {
   balloon_ = balloon;
   const Notification& notification = balloon_->notification();
   current_notification_id_ = notification.notification_id();
   std::string extension_id = GetExtensionId(balloon);
-  GetWebNotificationTray()->AddNotification(current_notification_id_,
-                                            notification.title(),
-                                            notification.body(),
-                                            notification.display_source(),
-                                            extension_id);
+  GetMessageCenter()->AddNotification(current_notification_id_,
+                                      notification.title(),
+                                      notification.body(),
+                                      notification.display_source(),
+                                      extension_id);
   FetchIcon(notification);
 }
 
 void BalloonViewAsh::Update() {
   const Notification& notification = balloon_->notification();
   std::string new_notification_id = notification.notification_id();
-  GetWebNotificationTray()->UpdateNotification(current_notification_id_,
-                                               new_notification_id,
-                                               notification.title(),
-                                               notification.body());
+  GetMessageCenter()->UpdateNotification(current_notification_id_,
+                                         new_notification_id,
+                                         notification.title(),
+                                         notification.body());
   current_notification_id_ = new_notification_id;
   FetchIcon(notification);
 }
 
 void BalloonViewAsh::RepositionToBalloon() {
 }
 
 void BalloonViewAsh::Close(bool by_user) {
   Notification notification(balloon_->notification());  // Copy notification
   collection_->OnBalloonClosed(balloon_);  // Deletes balloon.
   notification.Close(by_user);
-  GetWebNotificationTray()->RemoveNotification(notification.notification_id());
+  GetMessageCenter()->RemoveNotification(notification.notification_id());
 }
 
 gfx::Size BalloonViewAsh::GetSize() const {
   return gfx::Size();
 }
 
 BalloonHost* BalloonViewAsh::GetHost() const {
   return NULL;
 }
 
 void BalloonViewAsh::FetchIcon(const Notification& notification) {
   if (!notification.icon().isNull()) {
-    ash::Shell::GetInstance()->GetWebNotificationTray()->SetNotificationImage(
+    GetMessageCenter()->SetNotificationImage(
         notification.notification_id(), notification.icon());
     return;
   }
   if (notification.icon_url().is_empty())
     return;
   content::RenderViewHost* rvh = notification.GetRenderViewHost();
   if (!rvh) {
     LOG(WARNING) << "Notification has icon url but no RenderViewHost";
     return;
   }
@@ skipping 12 matching lines @@
   ExtensionService* extension_service =
       balloon_->profile()->GetExtensionService();
   const GURL& origin = balloon_->notification().origin_url();
   const extensions::Extension* extension =
       extension_service->extensions()->GetExtensionOrAppByURL(
           ExtensionURLInfo(origin));
   if (extension)
     return extension->id();
   return std::string();
 }