New location security strings and animation.

chrome/browser/ui/views/location_bar/location_icon_view.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/location_bar/location_icon_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/components_scaled_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/painter.h"
 
-using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 LocationIconView::LocationIconView(const gfx::FontList& font_list,
                                    SkColor parent_background_color,
                                    LocationBarView* location_bar)
     : IconLabelBubbleView(IDR_OMNIBOX_HTTPS_INVALID,
                           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)
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 #else
   SetFocusBehavior(FocusBehavior::ALWAYS);
 #endif
 
   SetBackground(false);
+  animation_.SetSlideDuration(kOpenTimeMS);
 }
 
 LocationIconView::~LocationIconView() {
 }
 
 bool LocationIconView::OnMousePressed(const ui::MouseEvent& event) {
   if (event.IsOnlyMiddleMouseButton() &&
       ui::Clipboard::IsSupportedClipboardType(ui::CLIPBOARD_TYPE_SELECTION)) {
     base::string16 text;
     ui::Clipboard::GetForCurrentThread()->ReadText(
@@ skipping 60 matching lines @@
 }
 
 gfx::Size LocationIconView::GetMinimumSizeForLabelText(
     const base::string16& text) const {
   views::Label label(text, font_list());
   return GetMinimumSizeForPreferredSize(
       GetSizeForLabelWidth(label.GetPreferredSize().width()));
 }
 
 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 {
   return GetTextColor();
 }
 
 bool LocationIconView::OnActivate(const ui::Event& event) {
   WebContents* contents = location_bar_->GetWebContents();
   if (!contents)
     return false;
@@ skipping 21 matching lines @@
   return size;
 }
 
 void LocationIconView::SetBackground(bool should_show_ev) {
   static const int kEvBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_EV_BUBBLE);
   if (should_show_ev)
     SetBackgroundImageGrid(kEvBackgroundImages);
   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();
+}