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..f2451fea6f1a5fa5e242fec6b9b172fb7fb66159 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -318,8 +318,15 @@ class LocationBarView : public LocationBar,
   // Returns true if the suggest text is valid.
   bool HasValidSuggestText() const;
 
+  base::string16 GetSecurityText() const;
   bool ShouldShowKeywordBubble() const;
   bool ShouldShowEVBubble() const;
+  std::string TrimSite(const std::string& url) const;

[Peter Kasting, 2016/08/15 23:29:49]

Nit: Neither of the new functions here is 100% clear from the name, so you
should probably add descriptive comments for each.

[Kevin Bailey, 2016/08/16 16:39:36]

Done.

+
+  // Returns true if the security chip should be displayed and is ready.

[Peter Kasting, 2016/08/15 23:29:49]

Nit: What does "and is ready" mean from the perspective of the reader here?  I
think you mean it to distinguish the case of "we should in theory be displaying
the chip but in practice can't do so yet", but the caller just cares about
"should I show the chip _right now_", and that's the sense I'd read "should be
displayed" in.  So I'd just remove these three words.

[Kevin Bailey, 2016/08/16 16:39:36]

Done.

+  // This uses a small state machine to filter false positives during
+  // page transition.
+  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
@@ -463,6 +470,15 @@ class LocationBarView : public LocationBar,
   // focused. Used when the toolbar is in full keyboard accessibility mode.
   bool show_focus_rect_;
 
+  struct LoadState {
+    // Used to monitor the state of page loading, forward, back, etc.
+    // and align a security state with a URL.
+    std::string last_site_;
+    int last_index_;
+    bool last_returned_;
+  };

[Peter Kasting, 2016/08/15 23:29:49]

Nit: We normally put struct defs at the top of the section, right above
typedefs.

[Kevin Bailey, 2016/08/16 16:39:36]

Done.

+  std::unique_ptr<LoadState> load_state_;
+
   // This is in case we're destroyed before the model loads. We need to make
   // Add/RemoveObserver calls.
   TemplateURLService* template_url_service_;