New location security strings and animation.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 300 matching lines @@
 
   // Updates |manage_passwords_icon_view_|. Returns true if visibility changed.
   bool RefreshManagePasswordsIconView();
 
   // Helper to show the first run info bubble.
   void ShowFirstRunBubbleInternal();
 
   // 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
   // current position of the omnibox, calculates what value the desired
   // animation (|hide_url_animation_| if |hide| is true, |show_url_animation_|
   // if it's false) should be set to in order to produce the same omnibox
   // position.  This way we can stop the old animation, set the new animation to
   // this value, and start it running, and the text will appear to reverse
   // directions from its current location.
   double GetValueForAnimation(bool hide) const;
@@ skipping 123 matching lines @@
   gfx::SlideAnimation size_animation_;
 
   // Whether we're in popup mode. This value also controls whether the location
   // bar is read-only.
   const bool is_popup_mode_;
 
   // True if we should show a focus rect while the location entry field is
   // 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_;
 
   // Tracks this preference to determine whether bookmark editing is allowed.
   BooleanPrefMember edit_bookmarks_enabled_;
 
   // This is a debug state variable that stores if the WebContents was null
   // during the last RefreshPageAction.
   bool web_contents_null_at_last_refresh_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_