summaryrefslogtreecommitdiffstats
path: root/views/animation/bounds_animator.h
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 20:01:00 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 20:01:00 +0000
commit69c579e522c4493c15c93ebf33b28a35b1e7213b (patch)
tree5dde3cc78e0de04bb87613c09be12b47b80d8307 /views/animation/bounds_animator.h
parent12f144239468f206dc82c3f3481fef477f636798 (diff)
downloadchromium_src-69c579e522c4493c15c93ebf33b28a35b1e7213b.zip
chromium_src-69c579e522c4493c15c93ebf33b28a35b1e7213b.tar.gz
chromium_src-69c579e522c4493c15c93ebf33b28a35b1e7213b.tar.bz2
Re-instate the temporary revert from r45267. That reverted certain
Omnibox, toolbar, tab animations, and other UI changes for purposes of testing and merging into mstone-5. Additionally reverts these CLs to fix the earlier revert: r45271: [Mac] Image references missing from Omnibox revert. r45268: GTK fix merge failure in uber-revert. Additional revert which fixed a bug for the branch: r45381: [Mac] Omnibox popup icons and text lined up under toolbar. Slight merge conflict which should be good: r45322: GTK: Implement OnDragCanceled() for autocomplete... Also ++kThemePackVersion and regenerate the cached theme pak. Re-instated changes: r45213: GTK: Override cursor colors in chrome-theme mode. r45103: Support drawing nano tabs in the tabstrip. r45084: GTK: Position the EV certificate stuff inside a green bubble. r44979: Subclassing the InfoBubble to handle anchoring bubbles basedon... r44957: GTK: Tint the geolocation icons in gtk mode. r44943: Changes FormatURL to not strip http if the host starts with ft... r44930: Remove an icon that is no longer used. r44929: SSL UI changes, Windows, code side (images are separate). r44859: SSL UI changes (icons). TBRed since trybots hate binary patches. r44822: GTK: Select better greens in the native omnibox popup. r44814: GTK: navigate to URL on PRIMARY when middle-clicking the locat... r44789: [Mac] Bookmark star missing on NTP and BMM. r44775: [Mac] Centralize hack to make tests work with AutocompleteClas... r44678: Display the SECURITY_WARNING status in the location bar for the r44648: [Mac] Add an arrow cursor rect for the location image. r44615: Revert r44611 because it may have broken "unit_tests" on "Vist... r44611: Display the SECURITY_WARNING status in the location bar for the r44577: Revert 44572 - [Mac] Update locationbar icon as user types. r44572: [Mac] Update location-bar icon as user types. r44555: GTK: Use correct button mask on reload button. r44545: [Mac] Omnibox text drag drag URL when select-all. r44523: GTK: Prevent inappropriate drag of location bar location icon. r44519: GTK: make the primary selection include the url's scheme when ... r44492: [Mac] Fix search icon in keyword search to be right-side-up. r44415: GTK: Update top padding on icons in the autocomplete popup. r44401: GTK: Tint omnibox icons in GTK mode differently. r44380: GTK: Move reload in gtk mode and fix omnibox popup location. r44282: Fixes crash in autocomplete when typing some URLs. The problem r44273: [Mac] PDF icons for omnibox nits. r44269: Fix build break due to bad merge resolve r44268: Shift omnibox dropdown in and up on Windows, and square off th... r44178: GTK: fix TTS padding. r44177: Round the top left and right edges of the toolbar. r44171: Images only checkin for try server goodness. r44163: GTK: fix padding of autocomplete popup. r44152: [Mac] PDF icons for omnibox. r44145: GTK: Theme the icons in the location bar and use GTK colors fo... r44140: Strips http from the omnibox r44131: Fixes bugs in new tab strip animations where they weren't doin... r44116: Change the default theme colors. r44117: Add newline to EOF to fix CrOS builder. r44115: Make the bottom edges of the opaque frame rounded. r44091: [Mac] No star icon or page actions in omnibox on popups. r44087: Don't allow drag or click on location icon when editing in omn... r44021: [GTK] Add TTS lens graphic to linux TTS box. r44008: [Mac] Tweak location icon spacing in omnibox. r43977: GTK: don't show the star or page actions in ShouldOnlyShowLoca... r43972: Make the firstrun bubble point at a better spot now that the l... r43971: [Mac] Location icon in omnibox as drag source. r43970: Make the star and page action icons not appear on popup windows. r43954: Fixes bug in TabStrip where dragging tab out then back in rapidly r43864: Tweaks to BoundsAnimator/SlideAnimation and TabStrip: r43787: Allow location icon to be dragged & dropped. This also fixes ... r43759: Changes end cap of tab-to-search images. r43740: Change bookmark bar toggle to ctrl-shift-b. r43723: Show Page Info dialog on mouse up, not mouse down. r43677: Fix Mac build failure. r43676: Replace omnibox icons with new set that are all the same size ... r43596: Fix browser test TestStarButtonAccObj. r43593: Disables TestStarButtonAccObj. r43582: Changes tab strip to use BoundsAnimator for tab strip animatio... r43563: GTK: don't show reload button for popup/app windows. r43562: Star/reload shuffle, Windows version. r43540: [Mac] Magnifying glass in keyword-search bubble. r43482: Adds images needed for new tab animation. I'm separating this ... r43422: Add reload mask resource. r43392: GTK: make the location icon a drag source. r43376: [Mac] Move star button into page-actions area of omnibox. r43357: [Mac] Line up omnibox popup under field. r43290: gtk: fix display of icons in omnibox popup r43269: GTK: fix reload button. r43249: [Mac] Rearrange SSL status icon/label in omnibox. r43248: BrowserThemePack: Adds persistant ids for the reload endcaps. r43241: GTK: more location bar updates. r43191: Fix memory leak in BrowserThemePack. r43154: GTK: set the new star button's ID r43151: Fix bad conflict resolution for r43146. r43146: GTK: toolbar reload/star shuffle. r43025: Show the location bar icon (almost) all the time, and have its... r43023: Add new images for new reload button. No code change. r42782: Remove this icon, now that it's no longer used (due to my secu... r42502: Omnibox M5 work, part 1: Security changes r42245: Check in new icons for omnibox security changes alone, so that... BUG=none TEST=People go back to complaining about missing http://. R=pkasting@chromium.org,beng@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/animation/bounds_animator.h')
-rw-r--r--views/animation/bounds_animator.h24
1 files changed, 14 insertions, 10 deletions
diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h
index ab2fde9..606c05f 100644
--- a/views/animation/bounds_animator.h
+++ b/views/animation/bounds_animator.h
@@ -50,7 +50,9 @@ class BoundsAnimator : public AnimationDelegate,
// Starts animating |view| from its current bounds to |target|. If
// |delete_when_done| is true the view is deleted when the animation
// completes. If there is already an animation running for the view it's
- // stopped and a new one started.
+ // stopped and a new one started. If an AnimationDelegate has been set for
+ // |view| it is removed (after being notified that the animation was
+ // canceled).
void AnimateViewTo(View* view,
const gfx::Rect& target,
bool delete_when_done);
@@ -64,7 +66,7 @@ class BoundsAnimator : public AnimationDelegate,
const SlideAnimation* GetAnimationForView(View* view);
// Stops animating the specified view. If the view was scheduled for deletion
- // it is deleted.
+ // it is deleted. This does nothing if |view| is not currently animating.
void StopAnimatingView(View* view);
// Sets the delegate for the animation created for the specified view. If
@@ -88,6 +90,10 @@ class BoundsAnimator : public AnimationDelegate,
observer_ = observer;
}
+ protected:
+ // Creates the animation to use for animating views.
+ virtual SlideAnimation* CreateAnimation();
+
private:
// Tracks data about the view being animated.
struct Data {
@@ -120,15 +126,13 @@ class BoundsAnimator : public AnimationDelegate,
typedef std::map<const Animation*, View*> AnimationToViewMap;
- // Creates the animation to use for animating views.
- SlideAnimation* CreateAnimation();
-
- // Removes references to |view| and its animation as well as deleting |view|
- // (if necessary). This does NOT delete the animation or delegate.
- void RemoveFromMapsAndDelete(View* view);
+ // Removes references to |view| and its animation. This does NOT delete the
+ // animation or delegate.
+ void RemoveFromMaps(View* view);
- // Does the necessary cleanup for |data|.
- void CleanupData(Data* data);
+ // Does the necessary cleanup for |data|. If |send_cancel| is true and a
+ // delegate has been installed on |data| AnimationCanceled is invoked on it.
+ void CleanupData(bool send_cancel, Data* data, View* view);
// Used when changing the animation for a view. This resets the maps for
// the animation used by view and returns the current animation. Ownership