diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 20:02:05 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 20:02:05 +0000 |
| commit | 1a53f54afb599e5cbadd865b8ae6d8806b439d3e (patch) | |
| tree | d7c8fb23fff13c6b4e753df9447891f89780aed6 /chrome/browser/ui/gtk/infobars/infobar_gtk.cc | |
| parent | c5cfdbe75fe43c9b342d332636155db6b6b9381c (diff) | |
| download | chromium_src-1a53f54afb599e5cbadd865b8ae6d8806b439d3e.zip chromium_src-1a53f54afb599e5cbadd865b8ae6d8806b439d3e.tar.gz chromium_src-1a53f54afb599e5cbadd865b8ae6d8806b439d3e.tar.bz2 | |
Various pieces of infobar cleanup:
* Simplify some code in the views implementation. Remove an unnecessary animation Stop() call. Move other code to PlatformSpecificShow(), now that it exists, to try and simplify ViewHierarchyChanged(), and so that it executes "when we actually show the infobar" (doesn't really matter, the two are called right after each other).
* Convert InfoBar::animation_ from a scoped_ptr<> to an object; it lives for the life of the InfoBar so there's no real reason to use a pointer. Also convert the const getter to returning a const ref.
* Update a comment to be a bit more accurate, especially now that the views code doesn't stop the animation in ViewHierarchyChanged().
* Use |i| for an iterator instead of the verbose |infobar_iterator|
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7190024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/infobars/infobar_gtk.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/infobars/infobar_gtk.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/gtk/infobars/infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/infobar_gtk.cc index 0b1c5f5..4774147 100644 --- a/chrome/browser/ui/gtk/infobars/infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/infobar_gtk.cc @@ -115,7 +115,7 @@ GdkColor InfoBarGtk::GetBorderColor() const { } int InfoBarGtk::AnimatingHeight() const { - return animation()->is_animating() ? bar_target_height() : 0; + return animation().is_animating() ? bar_target_height() : 0; } SkColor InfoBarGtk::ConvertGetColor(ColorGetter getter) { |