Makes notifications animate from the bottom of the screen (as was

chrome/browser/ui/views/notifications/balloon_view_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/notifications/balloon_view_views.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 69 matching lines @@
 // Menu commands
 const int kRevokePermissionCommand = 0;
 
 // Colors
 const SkColor kControlBarBackgroundColor = SkColorSetRGB(245, 245, 245);
 const SkColor kControlBarTextColor = SkColorSetRGB(125, 125, 125);
 const SkColor kControlBarSeparatorLineColor = SkColorSetRGB(180, 180, 180);
 
 }  // namespace
 
+// static
+int BalloonView::GetHorizontalMargin() {
+  return kLeftMargin + kRightMargin + kLeftShadowWidth + kRightShadowWidth;
+}
+
 BalloonViewImpl::BalloonViewImpl(BalloonCollection* collection)
     : balloon_(NULL),
       collection_(collection),
       frame_container_(NULL),
       html_container_(NULL),
       html_contents_(NULL),
       method_factory_(this),
       close_button_(NULL),
       animation_(NULL),
       options_menu_model_(NULL),
@@ skipping 100 matching lines @@
   options_menu_button_->SetBoundsRect(GetOptionsButtonBounds());
   source_label_->SetBoundsRect(GetLabelBounds());
 }
 
 void BalloonViewImpl::RepositionToBalloon() {
   DCHECK(frame_container_);
   DCHECK(html_container_);
   DCHECK(balloon_);
 
   if (!kAnimateEnabled) {
-    frame_container_->SetBounds(
-        gfx::Rect(balloon_->GetPosition().x(), balloon_->GetPosition().y(),
-                  GetTotalWidth(), GetTotalHeight()));
+    frame_container_->SetBounds(GetBoundsForFrameContainer());
     gfx::Rect contents_rect = GetContentsRectangle();
     html_container_->SetBounds(contents_rect);
     html_contents_->SetPreferredSize(contents_rect.size());
     content::RenderWidgetHostView* view =
         html_contents_->web_contents()->GetRenderWidgetHostView();
     if (view)
       view->SetSize(contents_rect.size());
     return;
   }
 
-  anim_frame_end_ = gfx::Rect(
-      balloon_->GetPosition().x(), balloon_->GetPosition().y(),
-      GetTotalWidth(), GetTotalHeight());
+  anim_frame_end_ = GetBoundsForFrameContainer();
   anim_frame_start_ = frame_container_->GetClientAreaBoundsInScreen();
   animation_.reset(new ui::SlideAnimation(this));
   animation_->Show();
 }
 
 void BalloonViewImpl::Update() {
   DCHECK(html_contents_.get()) << "BalloonView::Update called before Show";
   if (!html_contents_->web_contents())
     return;
   html_contents_->web_contents()->GetController().LoadURL(
       balloon_->notification().content_url(), content::Referrer(),
       content::PAGE_TRANSITION_LINK, std::string());
 }
 
 void BalloonViewImpl::AnimationProgressed(const ui::Animation* animation) {
   DCHECK(animation == animation_.get());
 
   // Linear interpolation from start to end position.
-  double e = animation->GetCurrentValue();
-  double s = (1.0 - e);
-
-  gfx::Rect frame_position(
-    static_cast<int>(s * anim_frame_start_.x() +
-                     e * anim_frame_end_.x()),
-    static_cast<int>(s * anim_frame_start_.y() +
-                     e * anim_frame_end_.y()),
-    static_cast<int>(s * anim_frame_start_.width() +
-                     e * anim_frame_end_.width()),
-    static_cast<int>(s * anim_frame_start_.height() +
-                     e * anim_frame_end_.height()));
+  gfx::Rect frame_position(animation_->CurrentValueBetween(
+                               anim_frame_start_, anim_frame_end_));
   frame_container_->SetBounds(frame_position);
 
   gfx::Path path;
   gfx::Rect contents_rect = GetContentsRectangle();
   html_container_->SetBounds(contents_rect);
   GetContentsMask(contents_rect, &path);
   html_container_->SetShape(path.CreateNativeRegion());
 
   html_contents_->SetPreferredSize(contents_rect.size());
   content::RenderWidgetHostView* view =
@@ skipping 63 matching lines @@
   //   corners using alpha blending (and we may do other alpha blending
   //   effects).
   // Unfortunately, layered windows cannot have child windows. (Well, they can
   // but the child windows don't render).
   //
   // We carefully keep these two windows in sync to present the illusion of
   // one window to the user.
   //
   // We don't let the OS manage the RTL layout of these widgets, because
   // this code is already taking care of correctly reversing the layout.
-  gfx::Rect contents_rect = GetContentsRectangle();
 #if defined(OS_CHROMEOS) && defined(USE_AURA)
   html_contents_.reset(new chromeos::BalloonViewHost(balloon));
 #else
   html_contents_.reset(new BalloonViewHost(balloon));
 #endif
   html_contents_->SetPreferredSize(gfx::Size(10000, 10000));
   if (enable_web_ui_)
     html_contents_->EnableWebUI();
 
   html_container_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
-  params.bounds = contents_rect;
   html_container_->Init(params);
   html_container_->SetContentsView(html_contents_->view());
 
-  gfx::Rect balloon_rect(x(), y(), GetTotalWidth(), GetTotalHeight());
   frame_container_ = new views::Widget;
   params.delegate = this;
   params.transparent = true;
-  params.bounds = balloon_rect;
+  params.bounds = GetBoundsForFrameContainer();
   frame_container_->Init(params);
   frame_container_->SetContentsView(this);
   frame_container_->StackAboveWidget(html_container_);
 
+  // GetContentsRectangle() is calculated relative to |frame_container_|. Make
+  // sure |frame_container_| has bounds before we ask for
+  // GetContentsRectangle().
+  html_container_->SetBounds(GetContentsRectangle());
+
   // SetAlwaysOnTop should be called after StackAboveWidget because otherwise
   // the top-most flag will be removed.
   html_container_->SetAlwaysOnTop(true);
   frame_container_->SetAlwaysOnTop(true);
 
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetImageSkiaNamed(IDR_TAB_CLOSE));
   close_button_->SetImage(views::CustomButton::BS_HOT,
                           rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
@@ skipping 82 matching lines @@
   path->lineTo(right, bottom);
   path->lineTo(left, bottom);
   path->close();
 }
 
 gfx::Point BalloonViewImpl::GetContentsOffset() const {
   return gfx::Point(kLeftShadowWidth + kLeftMargin,
                     kTopShadowWidth + kTopMargin);
 }
 
+gfx::Rect BalloonViewImpl::GetBoundsForFrameContainer() const {
+  return gfx::Rect(balloon_->GetPosition().x(), balloon_->GetPosition().y(),
+                   GetTotalWidth(), GetTotalHeight());
+}
+
 int BalloonViewImpl::GetShelfHeight() const {
   // TODO(johnnyg): add scaling here.
   int max_button_height = std::max(std::max(
       close_button_->GetPreferredSize().height(),
       options_menu_button_->GetPreferredSize().height()),
       source_label_->GetPreferredSize().height());
   return max_button_height + kShelfMargin * 2;
 }
 
 int BalloonViewImpl::GetBalloonFrameHeight() const {
@@ skipping 57 matching lines @@
     return;
   }
 
   // If the renderer process attached to this balloon is disconnected
   // (e.g., because of a crash), we want to close the balloon.
   notification_registrar_.Remove(
       this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
       content::Source<Balloon>(balloon_));
   Close(false);
 }