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

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/ash/balloon_collection_impl_ash.h" 5 #include "chrome/browser/ui/views/ash/balloon_collection_impl_ash.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/status_area_widget.h"
9 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/notifications/balloon.h" 9 #include "chrome/browser/notifications/balloon.h"
11 #include "chrome/browser/notifications/desktop_notification_service.h" 10 #include "chrome/browser/notifications/desktop_notification_service.h"
12 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 11 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
13 #include "chrome/browser/notifications/notification.h" 12 #include "chrome/browser/notifications/notification.h"
14 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/ui/browser_finder.h" 14 #include "chrome/browser/ui/browser_finder.h"
16 #include "chrome/browser/ui/chrome_pages.h" 15 #include "chrome/browser/ui/chrome_pages.h"
17 #include "chrome/browser/ui/views/ash/balloon_view_ash.h" 16 #include "chrome/browser/ui/views/ash/balloon_view_ash.h"
18 #include "chrome/browser/ui/views/notifications/balloon_view_host.h" 17 #include "chrome/browser/ui/views/notifications/balloon_view_host.h"
19 #include "chrome/browser/ui/views/notifications/balloon_view_views.h" 18 #include "chrome/browser/ui/views/notifications/balloon_view_views.h"
20 19
21 BalloonCollectionImplAsh::BalloonCollectionImplAsh() { 20 BalloonCollectionImplAsh::BalloonCollectionImplAsh() {
22 ash::Shell::GetInstance()->status_area_widget()-> 21 ash::Shell::GetInstance()->GetWebNotificationTray()->SetDelegate(this);
23 web_notification_tray()->SetDelegate(this);
24 } 22 }
25 23
26 BalloonCollectionImplAsh::~BalloonCollectionImplAsh() { 24 BalloonCollectionImplAsh::~BalloonCollectionImplAsh() {
27 } 25 }
28 26
29 bool BalloonCollectionImplAsh::HasSpace() const { 27 bool BalloonCollectionImplAsh::HasSpace() const {
30 return true; // Overflow is handled by ash::WebNotificationTray. 28 return true; // Overflow is handled by ash::WebNotificationTray.
31 } 29 }
32 30
33 void BalloonCollectionImplAsh::Add(const Notification& notification, 31 void BalloonCollectionImplAsh::Add(const Notification& notification,
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 return extension_service->extensions()->GetExtensionOrAppByURL( 135 return extension_service->extensions()->GetExtensionOrAppByURL(
138 ExtensionURLInfo(origin)); 136 ExtensionURLInfo(origin));
139 } 137 }
140 138
141 #if defined(OS_CHROMEOS) 139 #if defined(OS_CHROMEOS)
142 // static 140 // static
143 BalloonCollection* BalloonCollection::Create() { 141 BalloonCollection* BalloonCollection::Create() {
144 return new BalloonCollectionImplAsh(); 142 return new BalloonCollectionImplAsh();
145 } 143 }
146 #endif 144 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/shelf_browsertest.cc ('k') | chrome/browser/ui/views/ash/balloon_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698