New location security strings and animation.

chrome/browser/ui/views/location_bar/location_bar_view.h

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index dea93ce21b77d5c7560620f7530fbe541146854a..75b28e80cccf4cfd403264d1397c1858c6494fa8 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -109,7 +109,7 @@ class LocationBarView : public LocationBar,
     TEXT,
     SELECTED_TEXT,
     DEEMPHASIZED_TEXT,
-    EV_BUBBLE_TEXT_AND_BORDER,
+    SECURITY_CHIP_TEXT_AND_BORDER,
   };
 
   // The location bar view's class name.
@@ -318,9 +318,16 @@ class LocationBarView : public LocationBar,
   // Returns true if the suggest text is valid.
   bool HasValidSuggestText() const;
 
+  // Returns text describing the URL's security level, for the icon view.

[Peter Kasting, 2016/08/18 06:24:37]

Nit: icon view -> security chip?

[Kevin Bailey, 2016/08/18 16:09:36]

I'm trying to tell the reader where it goes. If I say security chip, I'm not
even sure that they can search for that.

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

Well, we use the phrase "security chip" to describe the feature elsewhere in
this file, so we should be naming it the same.  If you don't think "security
chip" itself is obvious, and that needs to be described somewhere, that's fine,
but this doesn't seem like the place (and you're not actually explaining that
with the current comment either, because you don't mention "security chip").

Really, all the terminology needs to change.  In MD, we no longer have "bubbles"
to speak of for EV/security or keyword search.  We just have labels with a
divider next to them.  So maybe everything everywhere that talks about EV
bubble, security chip, keyword search bubble, etc. should all just say "security
label" and "keyword search label" or something.

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

I think my version would be a bit verbose compared to the other method
descriptions.

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

Never let that discourage you from leaving good comments, if they would actually
be useful!

+  base::string16 GetSecurityText() const;
   bool ShouldShowKeywordBubble() const;
   bool ShouldShowEVBubble() const;
 
+  // Returns true if the security chip should be displayed.
+  // This uses a small state machine to filter false positives during
+  // page transition.

[Peter Kasting, 2016/08/18 06:24:37]

Nit: No longer accurate

[Kevin Bailey, 2016/08/18 16:09:36]

Done.

+  bool ShouldShowSecurityChip() const;
+
   // Used to "reverse" the URL showing/hiding animations, since we use separate
   // animations whose curves are not true inverses of each other.  Based on the
   // current position of the omnibox, calculates what value the desired
@@ -463,6 +470,8 @@ class LocationBarView : public LocationBar,
   // focused. Used when the toolbar is in full keyboard accessibility mode.
   bool show_focus_rect_;
 
+  bool showing_security_chip_;
+
   // This is in case we're destroyed before the model loads. We need to make
   // Add/RemoveObserver calls.
   TemplateURLService* template_url_service_;