diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc index 047ab69bf7ae..bd58042b4e60 100644 --- a/components/url_formatter/url_formatter.cc +++ b/components/url_formatter/url_formatter.cc @@ -462,14 +462,14 @@ bool IDNToUnicodeOneComponent(const base::char16* comp, } // namespace const FormatUrlType kFormatUrlOmitNothing = 0; -const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0; -const FormatUrlType kFormatUrlOmitHTTP = 1 << 1; -const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2; -const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3; -const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5; -const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6; -const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7; -const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8; +const FormatUrlType kFormatUrlOmitUsernamePassword = 0; +const FormatUrlType kFormatUrlOmitHTTP = 0; +const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0; +const FormatUrlType kFormatUrlOmitHTTPS = 0; +const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0; +const FormatUrlType kFormatUrlTrimAfterHost = 0; +const FormatUrlType kFormatUrlOmitFileScheme = 0; +const FormatUrlType kFormatUrlOmitMailToScheme = 0; const FormatUrlType kFormatUrlOmitDefaults = kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP | diff --git a/components/url_formatter/elide_url.cc b/components/url_formatter/elide_url.cc index 25b56277b5b3..77fc6f273bbb 100644 --- a/components/url_formatter/elide_url.cc +++ b/components/url_formatter/elide_url.cc @@ -132,6 +132,8 @@ void SplitHost(const GURL& url, bool ShouldShowScheme(base::StringPiece scheme, const url_formatter::SchemeDisplay scheme_display) { + return true; + switch (scheme_display) { case url_formatter::SchemeDisplay::SHOW: return true; diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index fe86f86bf310..0bff007ae755 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -2133,6 +2133,7 @@ gfx::Range OmniboxViewViews::GetPathBounds() { } bool OmniboxViewViews::CanFadePath() { + return false; if (HasFocus() || model()->user_input_in_progress()) return false; if (!model()->CurrentTextIsURL())