Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Unified Diff: chrome/browser/ui/views/ash/balloon_view_ash.cc

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/ash/balloon_view_ash.cc
diff --git a/chrome/browser/ui/views/ash/balloon_view_ash.cc b/chrome/browser/ui/views/ash/balloon_view_ash.cc
index 9bc53fe0d37a141a0ba201de970d1c31fde78bb6..cccddf50067ad32095fbf5c55de889e90f7971f0 100644
--- a/chrome/browser/ui/views/ash/balloon_view_ash.cc
+++ b/chrome/browser/ui/views/ash/balloon_view_ash.cc
@@ -5,7 +5,6 @@
#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"
@@ -30,8 +29,7 @@ namespace {
const int kNotificationIconImageSize = 32;
ash::WebNotificationTray* GetWebNotificationTray() {
- return ash::Shell::GetInstance()->
- status_area_widget()->web_notification_tray();
+ return ash::Shell::GetInstance()->GetWebNotificationTray();
}
} // namespace
@@ -134,9 +132,8 @@ BalloonHost* BalloonViewAsh::GetHost() const {
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())
« no previous file with comments | « chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698