chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc - Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/ash/balloon_collection_impl_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:

Index: chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc

diff --git a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc

index 504b680c32a936a6b009057439399fd6d5249cdb..66b2a01c6b1848b182b160e1714a39b302c8d655 100644

--- a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc

+++ b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc

@@ -5,7 +5,6 @@

#include "chrome/browser/ui/views/ash/balloon_collection_impl_ash.h"

#include "ash/shell.h"

-#include "ash/system/status_area_widget.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/notifications/balloon.h"

#include "chrome/browser/notifications/desktop_notification_service.h"

@@ -19,8 +18,7 @@

#include "chrome/browser/ui/views/notifications/balloon_view_views.h"

BalloonCollectionImplAsh::BalloonCollectionImplAsh() {

- ash::Shell::GetInstance()->status_area_widget()->

- web_notification_tray()->SetDelegate(this);

+ ash::Shell::GetInstance()->GetWebNotificationTray()->SetDelegate(this);

}

BalloonCollectionImplAsh::~BalloonCollectionImplAsh() {