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

Side by Side Diff: chrome/browser/notifications/balloon_collection_linux.cc

Issue 6260040: Reapply and fix r73019. BalloonViewImpl has a different implemementation on (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/notifications/balloon_collection_impl.h" 5 #include "chrome/browser/notifications/balloon_collection_impl.h"
6 6
7 #include "chrome/browser/notifications/balloon.h" 7 #include "chrome/browser/notifications/balloon.h"
8 #include "gfx/size.h"
9
10 #if defined(TOOLKIT_VIEWS)
8 #include "chrome/browser/ui/views/notifications/balloon_view.h" 11 #include "chrome/browser/ui/views/notifications/balloon_view.h"
9 #include "gfx/size.h" 12 #else
13 #include "chrome/browser/ui/gtk/notifications/balloon_view_gtk.h"
14 #endif
10 15
11 Balloon* BalloonCollectionImpl::MakeBalloon(const Notification& notification, 16 Balloon* BalloonCollectionImpl::MakeBalloon(const Notification& notification,
12 Profile* profile) { 17 Profile* profile) {
13 Balloon* balloon = new Balloon(notification, profile, this); 18 Balloon* balloon = new Balloon(notification, profile, this);
14 19
15 balloon->set_view(new BalloonViewImpl(this)); 20 balloon->set_view(new BalloonViewImpl(this));
16 gfx::Size size(layout_.min_balloon_width(), layout_.min_balloon_height()); 21 gfx::Size size(layout_.min_balloon_width(), layout_.min_balloon_height());
17 balloon->set_content_size(size); 22 balloon->set_content_size(size);
18 return balloon; 23 return balloon;
19 } 24 }
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 else 78 else
74 NOTREACHED(); 79 NOTREACHED();
75 80
76 PositionBalloons(true); 81 PositionBalloons(true);
77 } 82 }
78 83
79 // static 84 // static
80 BalloonCollection* BalloonCollection::Create() { 85 BalloonCollection* BalloonCollection::Create() {
81 return new BalloonCollectionImpl(); 86 return new BalloonCollectionImpl();
82 } 87 }
OLDNEW
« no previous file with comments | « chrome/browser/notifications/balloon_collection_impl.cc ('k') | chrome/browser/ui/gtk/notifications/balloon_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698