Don't show scheme in permission prompts if it is HTTPS

components/url_formatter/elide_url.h

 // Copyright 2014 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.
 //
 // This file defines utility functions for eliding URLs.
 
 #ifndef COMPONENTS_URL_FORMATTER_ELIDE_URL_H_
 #define COMPONENTS_URL_FORMATTER_ELIDE_URL_H_
 
 #include <string>
@@ skipping 30 matching lines @@
 // This function takes a GURL object and elides the host to fit within
 // the given width. The function will never elide past the TLD+1 point,
 // but after that, will leading-elide the domain name to fit the width.
 // Example: http://sub.domain.com ---> "...domain.com", or "...b.domain.com"
 // depending on the width.
 base::string16 ElideHost(const GURL& host_url,
                          const gfx::FontList& font_list,
                          float available_pixel_width);
 #endif  // !defined(OS_ANDROID)
 
+enum class SchemeDisplay {
+  SHOW,
+  OMIT_WEB,
+  OMIT_CRYPTOGRAPHIC,

[felt, 2016/04/18 01:16:26]

nit: The meanings of these names are not obvious to me, especially OMIT_WEB. Can
you either make the names clearer or add comments?

+};
+
 // This is a convenience function for formatting a URL in a concise and
 // human-friendly way, to help users make security-related decisions (or in
 // other circumstances when people need to distinguish sites, origins, or
 // otherwise-simplified URLs from each other).
 //
 // Internationalized domain names (IDN) may be presented in Unicode if
 // they're regarded safe. See |url_formatter::FormatUrl| for more details on
 // the algorithm).
 //
 // - Omits the path for standard schemes, excepting file and filesystem.
 // - Omits the port if it is the default for the scheme.
 //
 // Do not use this for URLs which will be parsed or sent to other applications.
 //
-// Generally, set prefer this function to
-// |FormatUrlForSecurityDisplayOmitScheme| unless there is plenty of indication
-// as to whether the origin is secure elsewhere in the UX. For example, in
-// Chrome's Origin Info Bubble, there are icons and strings indicating origin
-// (non-)security. But in the HTTP Basic Auth prompt (for example), the scheme
-// may be the only indicator.
-base::string16 FormatUrlForSecurityDisplay(const GURL& origin);
-
-// Just like |FormatUrlForSecurityDisplay|, but also:
-//
-// - Omits the scheme if SchemeIsHTTPOrHTTPS().
-base::string16 FormatUrlForSecurityDisplayOmitScheme(const GURL& origin);
+// Generally, prefer SchemeDisplay::SHOW to omitting the scheme unless there is
+// plenty of indication as to whether the origin is secure elsewhere in the UX.
+// For example, in Chrome's Origin Info Bubble, there are icons and strings
+// indicating origin (non-)security. But in the HTTP Basic Auth prompt (for
+// example), the scheme may be the only indicator.
+base::string16 FormatUrlForSecurityDisplay(
+    const GURL& origin,
+    const SchemeDisplay scheme_display = SchemeDisplay::SHOW);
 
 }  // namespace url_formatter
 
 #endif  // COMPONENTS_URL_FORMATTER_ELIDE_URL_H_