New location security strings and animation.

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

Index: chrome/browser/ui/views/location_bar/location_icon_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
index 03382cc2a54d3a2991f4245b0b071d5787b8ac90..598256fb99d6c08ea5b46a8f4a4de3922d5ae529 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -22,7 +22,6 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/painter.h"
 
-using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
@@ -34,7 +33,8 @@ LocationIconView::LocationIconView(const gfx::FontList& font_list,
                           parent_background_color,
                           true),
       suppress_mouse_released_action_(false),
-      location_bar_(location_bar) {
+      location_bar_(location_bar),
+      animation_(this) {
   set_id(VIEW_ID_LOCATION_ICON);
 
 #if defined(OS_MACOSX)
@@ -44,6 +44,7 @@ LocationIconView::LocationIconView(const gfx::FontList& font_list,
 #endif
 
   SetBackground(false);
+  animation_.SetSlideDuration(kOpenTimeMS);
 }
 
 LocationIconView::~LocationIconView() {
@@ -124,7 +125,8 @@ gfx::Size LocationIconView::GetMinimumSizeForLabelText(
 }
 
 SkColor LocationIconView::GetTextColor() const {
-  return location_bar_->GetColor(LocationBarView::EV_BUBBLE_TEXT_AND_BORDER);
+  return location_bar_->GetColor(
+      LocationBarView::SECURITY_CHIP_TEXT_AND_BORDER);
 }
 
 SkColor LocationIconView::GetBorderColor() const {
@@ -166,3 +168,28 @@ void LocationIconView::SetBackground(bool should_show_ev) {
   else
     UnsetBackgroundImageGrid();
 }
+
+void LocationIconView::AnimateSecurityChip() {

[Peter Kasting, 2016/08/20 01:16:43]

Nit: .cc definition order must match .h declaration order.

[Kevin Bailey, 2016/08/22 15:58:56]

I'm confused. It appears to match to me.

[Peter Kasting, 2016/08/22 22:58:09]

The issue is primarily with the existing methods in this file.  SetBackground()
is currently defined last in this .cc, but in the .h there are private methods
after it.  As a result, when you add your methods here after SetBackground(),
that's correct relative to that function, but not relative to e.g.
GetMinimumSizeForPreferredSize().

What I would do here is send a quick separate CL that just takes the existing
.cc functions and reorders them to match the .h.  Then this CL can add your new
methods in the right spot.

[Kevin Bailey, 2016/08/23 15:17:13]

The issue is entirely with the existing methods. I'll send a CL.

+  animation_.Show();
+}
+
+void LocationIconView::ShowSecurityChip() {
+  animation_.Reset(1);
+}
+
+void LocationIconView::HideSecurityChip() {
+  animation_.Reset(0);
+}
+
+bool LocationIconView::IsAnimatingSecurityChip() {
+  return animation_.is_animating() && animation_.GetCurrentValue() < 1;

[Peter Kasting, 2016/08/20 01:16:43]

Why is the second clause necessary?

[Kevin Bailey, 2016/08/22 15:58:56]

It isn't; I thought 'is_animating' was staying true longer than necessary, but
verified not.

+}
+
+void LocationIconView::AnimationProgressed(const gfx::Animation*) {
+  location_bar_->Layout();
+  location_bar_->SchedulePaint();
+}
+
+double LocationIconView::WidthMultiplier() const {
+  return animation_.GetCurrentValue();
+}