summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 02:32:27 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 02:32:27 +0000
commitbdeeb855365fa7fddf5f0d88997843b5e48fe575 (patch)
treeaba2988675f3c6e85901fc4105891bec62e2e0e8 /chrome/browser/notifications
parent91f4c79176102cab860d4a0ad14280d8bec50f15 (diff)
downloadchromium_src-bdeeb855365fa7fddf5f0d88997843b5e48fe575.zip
chromium_src-bdeeb855365fa7fddf5f0d88997843b5e48fe575.tar.gz
chromium_src-bdeeb855365fa7fddf5f0d88997843b5e48fe575.tar.bz2
Rename and move balloon_collection_impl_aura, rename balloon_view.cc
Also llow BalloonView.GetHost() to return NULL Original CL: http://codereview.chromium.org/10502026/ Added fix for win_aura BUG=124914 TEST=All notification related tests pass, notitifications work on all platforms (no behavior changes). TBR=oshima,ben Review URL: https://chromiumcodereview.appspot.com/10546006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
-rw-r--r--chrome/browser/notifications/balloon.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/notifications/balloon.h b/chrome/browser/notifications/balloon.h
index ada6fba..3179dbb 100644
--- a/chrome/browser/notifications/balloon.h
+++ b/chrome/browser/notifications/balloon.h
@@ -40,7 +40,8 @@ class BalloonView {
// The total size of the view.
virtual gfx::Size GetSize() const = 0;
- // The host for the view's contents.
+ // The host for the view's contents. May be NULL if an implementation does
+ // not have a host associated with it (i.e. does not do html rendering).
virtual BalloonHost* GetHost() const = 0;
};
@@ -79,14 +80,11 @@ class Balloon {
// min/max restrictions.
void ResizeDueToAutoResize(const gfx::Size& size);
- // Provides a view for this balloon. Ownership transfers
- // to this object.
+ // Provides a view for this balloon. Ownership transfers to this object.
void set_view(BalloonView* balloon_view);
// Returns the balloon view associated with the balloon.
- BalloonView* view() const {
- return balloon_view_.get();
- }
+ BalloonView* balloon_view() const { return balloon_view_.get(); }
// Returns the viewing size for the balloon (content + frame).
gfx::Size GetViewSize() const { return balloon_view_->GetSize(); }