Remove Shell::shelf()|status_area_widget()|launcher()

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/status_area_widget.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()->
-      status_area_widget()->web_notification_tray();
+  return ash::Shell::GetInstance()->GetWebNotificationTray();
 }
 
 }  // 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 82 matching lines @@
 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()->status_area_widget()->
-        web_notification_tray()->SetNotificationImage(
-            notification.notification_id(), notification.icon());
+    ash::Shell::GetInstance()->GetWebNotificationTray()->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;
   }
   content::WebContents* web_contents =
@@ skipping 11 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();
 }