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,

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

Nit: MD no longer puts a border around this, so might as well remove
_AND_BORDER.

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

Done, but to avoid having to follow a fickle UI, perhaps we should drop _TEXT
too.

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

I think leaving TEXT is good.  If that wasn't there it would sound like the
color for the whole UI, which I'd probably think of as the background color.

   };
 
   // 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.
+  base::string16 GetSecurityText() const;
   bool ShouldShowKeywordBubble() const;
   bool ShouldShowEVBubble() const;
 
+  // Returns true if the security chip should be displayed (if it has a
+  // verified security level.)
+  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 133 matching lines @@
   // 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_;
 
+  // Used to avoid animating if security level didn't change.
+  security_state::SecurityStateModel::SecurityLevel previous_security_level_;
+
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_