chrome/browser/task_manager/task_manager.cc - Issue 231213003: notification balloons: Remove views and cocoa implementations of BalloonCollection.

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/task_manager/task_manager.cc

Issue 231213003: notification balloons: Remove views and cocoa implementations of BalloonCollection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 8 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/notifications/notification_ui_manager.cc ('k') | chrome/browser/ui/cocoa/notifications/balloon_collection_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/task_manager/task_manager.cc

diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc

index 0bc723d0e76eb8abecf8ac2b4fa2a236d4a8dee1..2986e48bd7d70e84c0245f5efae8a0afd1ac97fd 100644

--- a/chrome/browser/task_manager/task_manager.cc

+++ b/chrome/browser/task_manager/task_manager.cc

@@ -47,7 +47,7 @@

#include "ui/base/text/bytes_formatting.h"

#include "ui/gfx/image/image_skia.h"

-#if !defined(OS_CHROMEOS)

+#if defined(TOOLKIT_GTK)

#include "chrome/browser/task_manager/notification_resource_provider.h"

#endif

@@ -276,7 +276,7 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager)

scoped_ptr<WebContentsInformation>(

new task_manager::GuestInformation())));

-#if !defined(OS_CHROMEOS) && defined(ENABLE_NOTIFICATIONS)

+#if defined(TOOLKIT_GTK) && defined(ENABLE_NOTIFICATIONS)

ResourceProvider* provider =

task_manager::NotificationResourceProvider::Create(task_manager);

if (provider)