diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 16:06:40 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 16:06:40 +0000 |
| commit | 2f7b07f360d55c69362da1f869ed97a6e2d7b9a7 (patch) | |
| tree | a60188a651b8c14947e9d722183eebeba566b2bd /ui/views/animation/bounds_animator.cc | |
| parent | ed447dad02345ab4753d009db34daca7030f779e (diff) | |
| download | chromium_src-2f7b07f360d55c69362da1f869ed97a6e2d7b9a7.zip chromium_src-2f7b07f360d55c69362da1f869ed97a6e2d7b9a7.tar.gz chromium_src-2f7b07f360d55c69362da1f869ed97a6e2d7b9a7.tar.bz2 | |
Adds LocationBarContainer that contains
LocationBarView. LocationBarContainer is a child of BrowserView so
that it can be placed outside of the ToolbarView.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10630013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/animation/bounds_animator.cc')
| -rw-r--r-- | ui/views/animation/bounds_animator.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/views/animation/bounds_animator.cc b/ui/views/animation/bounds_animator.cc index 18ae47a..2c3fd05 100644 --- a/ui/views/animation/bounds_animator.cc +++ b/ui/views/animation/bounds_animator.cc @@ -79,6 +79,12 @@ void BoundsAnimator::SetTargetBounds(View* view, const gfx::Rect& target) { data_[view].target_bounds = target; } +gfx::Rect BoundsAnimator::GetTargetBounds(View* view) { + if (!IsAnimating(view)) + return view->bounds(); + return data_[view].target_bounds; +} + void BoundsAnimator::SetAnimationForView(View* view, SlideAnimation* animation) { DCHECK(animation); |