[OriginChip] Add animations for the hiding and showing of the chip.

chrome/browser/ui/views/location_bar/origin_chip_view.cc

 // Copyright 2014 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/location_bar/origin_chip_view.h"
 
 #include "base/files/file_path.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/elide_url.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/origin_chip_info.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
-#include "content/public/browser/navigation_controller.h"
-#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
+#include "ui/gfx/animation/slide_animation.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 
 
 // OriginChipExtensionIcon ----------------------------------------------------
 
 class OriginChipExtensionIcon : public extensions::IconImage::Observer {
@@ skipping 86 matching lines @@
       location_bar_view_(location_bar_view),
       profile_(profile),
       showing_16x16_icon_(false) {
   scoped_refptr<SafeBrowsingService> sb_service =
       g_browser_process->safe_browsing_service();
   // May not be set for unit tests.
   if (sb_service && sb_service->ui_manager())
     sb_service->ui_manager()->AddObserver(this);
 
   SetFontList(font_list);
-}
 
-OriginChipView::~OriginChipView() {
-  scoped_refptr<SafeBrowsingService> sb_service =
-      g_browser_process->safe_browsing_service();
-  if (sb_service.get() && sb_service->ui_manager())
-    sb_service->ui_manager()->RemoveObserver(this);
-}
-
-void OriginChipView::Init() {
   image()->EnableCanvasFlippingForRTLUI(false);
 
   // TODO(gbillock): Would be nice to just use stock LabelButton stuff here.
   location_icon_view_ = new LocationIconView(location_bar_view_);
   // Make location icon hover events count as hovering the origin chip.
   location_icon_view_->set_interactive(false);
   location_icon_view_->ShowTooltip(true);
   AddChildView(location_icon_view_);
 
   host_label_ = new views::Label(base::string16(), GetFontList());
   AddChildView(host_label_);
+
+  fade_in_animation_.reset(new gfx::SlideAnimation(this));
+  fade_in_animation_->SetTweenType(gfx::Tween::LINEAR);
+  fade_in_animation_->SetSlideDuration(300);
+}
+
+OriginChipView::~OriginChipView() {
+  scoped_refptr<SafeBrowsingService> sb_service =
+      g_browser_process->safe_browsing_service();
+  if (sb_service.get() && sb_service->ui_manager())
+    sb_service->ui_manager()->RemoveObserver(this);
 }
 
 bool OriginChipView::ShouldShow() {
   return chrome::ShouldDisplayOriginChipV2() &&
       location_bar_view_->GetToolbarModel()->WouldOmitURLDueToOriginChip() &&
       location_bar_view_->GetToolbarModel()->origin_chip_enabled();
 }
 
 void OriginChipView::Update(content::WebContents* web_contents) {
   if (!web_contents)
@@ skipping 96 matching lines @@
   host_label_->SetBackgroundColor(
       bitmap.getColor(bitmap.width() / 2, bitmap.height() / 2));
 }
 
 void OriginChipView::OnChanged() {
   Update(location_bar_view_->GetWebContents());
   // TODO(gbillock): Also need to potentially repaint infobars to make sure the
   // arrows are pointing to the right spot. Only needed for some edge cases.
 }
 
+void OriginChipView::FadeIn() {
+  fade_in_animation_->Show();
+}
+
+void OriginChipView::AnimationProgressed(const gfx::Animation* animation) {
+  if (animation == fade_in_animation_.get())
+    SchedulePaint();
+  else
+    views::LabelButton::AnimationProgressed(animation);
+}
+
+void OriginChipView::AnimationEnded(const gfx::Animation* animation) {
+  if (animation == fade_in_animation_.get())
+    fade_in_animation_->Reset();
+  else
+    views::LabelButton::AnimationEnded(animation);
+}
+
 gfx::Size OriginChipView::GetPreferredSize() {
   gfx::Size label_size = host_label_->GetPreferredSize();
   gfx::Size icon_size = location_icon_view_->GetPreferredSize();
   int icon_spacing = showing_16x16_icon_ ?
       (k16x16IconLeadingSpacing + k16x16IconTrailingSpacing) : 0;
   return gfx::Size(kEdgeThickness + icon_size.width() + icon_spacing +
                    kIconTextSpacing + label_size.width() +
                    kTrailingLabelMargin + kEdgeThickness,
                    icon_size.height());
 }
@@ skipping 12 matching lines @@
       kIconTextSpacing;
   host_label_x += showing_16x16_icon_ ? k16x16IconTrailingSpacing : 0;
   int host_label_width =
       width() - host_label_x - kEdgeThickness - kTrailingLabelMargin;
   host_label_->SetBounds(host_label_x,
                          LocationBarView::kNormalEdgeThickness,
                          host_label_width,
                          height() - 2 * LocationBarView::kNormalEdgeThickness);
 }
 
+void OriginChipView::OnPaintBorder(gfx::Canvas* canvas) {
+  if (fade_in_animation_->is_animating()) {
+    canvas->SaveLayerAlpha(static_cast<uint8>(
+        fade_in_animation_->CurrentValueBetween(0, 255)));
+    views::LabelButton::OnPaintBorder(canvas);
+    canvas->Restore();
+  } else {
+    views::LabelButton::OnPaintBorder(canvas);
+  }
+}
+
 int OriginChipView::ElideDomainTarget(int target_max_width) {
   base::string16 host =
       OriginChip::LabelFromURLForProfile(url_displayed_, profile_);
   host_label_->SetText(host);
   int width = GetPreferredSize().width();
   if (width <= target_max_width)
     return width;
 
   gfx::Size label_size = host_label_->GetPreferredSize();
   int padding_width = width - label_size.width();
@@ skipping 18 matching lines @@
       location_icon_view_->page_info_helper()->ProcessEvent(located_event);
       location_icon_view_->set_interactive(false);
       return;
     }
     location_icon_view_->set_interactive(false);
   }
 
   UMA_HISTOGRAM_COUNTS("OriginChip.Pressed", 1);
   content::RecordAction(base::UserMetricsAction("OriginChipPress"));
 
-  location_bar_view_->GetOmniboxView()->ShowURL();
+  location_bar_view_->ShowURL();
 }
 
 // Note: When OnSafeBrowsingHit would be called, OnSafeBrowsingMatch will
 // have already been called.
 void OriginChipView::OnSafeBrowsingHit(
     const SafeBrowsingUIManager::UnsafeResource& resource) {}
 
 void OriginChipView::OnSafeBrowsingMatch(
     const SafeBrowsingUIManager::UnsafeResource& resource) {
   OnChanged();
 }