Render extension URLs with chips

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 59 matching lines @@
                         public gfx::AnimationDelegate,
                         public ChromeOmniboxEditController,
                         public DropdownBarHostDelegate,
                         public TemplateURLServiceObserver,
                         public zoom::ZoomEventManagerObserver {
  public:
   class Delegate {
    public:
     // Should return the current web contents.
     virtual content::WebContents* GetWebContents() = 0;
+    virtual const content::WebContents* GetWebContents() const = 0;
 
     virtual ToolbarModel* GetToolbarModel() = 0;
     virtual const ToolbarModel* GetToolbarModel() const = 0;
 
     // Creates PageActionImageView. Caller gets an ownership.
     virtual PageActionImageView* CreatePageActionImageView(
         LocationBarView* owner,
         ExtensionAction* action) = 0;
 
     // Returns ContentSettingBubbleModelDelegate.
@@ skipping 215 matching lines @@
   // Updates the Translate icon based on the current tab's Translate status.
   void RefreshTranslateIcon();
 
   // Updates |manage_passwords_icon_view_|. Returns true if visibility changed.
   bool RefreshManagePasswordsIconView();
 
   // Helper to show the first run info bubble.
   void ShowFirstRunBubbleInternal();
 
   // Returns text describing the URL's security level, to be placed in the
   // security chip.

[Peter Kasting, 2016/12/20 01:59:31]

This is somewhat misleading, since the extension name is not really about the
URL's "security level".

In general, since we're broadening the concept of this label beyond just
"security text", I would avoid saying "security" in any of the function names
here, as well as in comments (except where it is mentioned as one possible type
of information to show).

This is why I used "LocationIconText" and similar in the comment suggesting this
refactor.  That naming is also parallel to what the actual classes that display
this are called anyway.

[meacer, 2016/12/21 01:38:56]

Sorry I missed your naming suggestion in the previous patchset. Done.

-  base::string16 GetSecurityText() const;
+  base::string16 GetSecurityText(const GURL& url,
+                                 content::WebContents* contents) const;

[Peter Kasting, 2016/12/20 01:59:31]

Don't add these args; both callers pass the same values, and GetSecurityText()
can call them itself as it's non-static and the methods can be called from const
methods.

[meacer, 2016/12/21 01:38:56]

Done.

 
   bool ShouldShowKeywordBubble() const;
 
-  // Returns true when the current page is explicitly secure or insecure.
-  // In these cases, we should show the state of the security chip.
-  bool ShouldShowSecurityChip() const;
+  // Returns true if any of the following is true:
+  // - the current page is explicitly secure or insecure
+  // - the current page URL is a chrome-extension:// URL.
+  bool ShouldShowSecurityText() const;
 
-  // Returns true if the chip should be animated
-  bool ShouldAnimateSecurityChip() const;
+  // Returns true if the security text should be animated

[Peter Kasting, 2016/12/20 01:59:31]

Nit: Trailing period

[meacer, 2016/12/21 01:38:56]

Done.

+  bool ShouldAnimateSecurityText() 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 130 matching lines @@
   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_