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 91 matching lines @@
 
    protected:
     virtual ~Delegate() {}
   };
 
   enum ColorKind {
     BACKGROUND = 0,
     TEXT,
     SELECTED_TEXT,
     DEEMPHASIZED_TEXT,
-    EV_BUBBLE_TEXT_AND_BORDER,
+    SECURITY_CHIP_TEXT_AND_BORDER,
   };
 
   // The location bar view's class name.
   static const char kViewClassName[];
 
   LocationBarView(Browser* browser,
                   Profile* profile,
                   CommandUpdater* command_updater,
                   Delegate* delegate,
                   bool is_popup_mode);
@@ skipping 188 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;
 
+  // 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
   // 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 122 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_;
 
+  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_;
 
   // 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_