[Mac] Fullscreen Touch Bar URL Adjustments

chrome/browser/ui/cocoa/browser_window_touch_bar.mm

 // Copyright 2017 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_touch_bar.h"
 
 #include <memory>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/vector_icons.h"
 #include "components/prefs/pref_member.h"
 #include "components/search_engines/util.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/toolbar/vector_icons.h"
+#include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/vector_icons/vector_icons.h"
 
@@ skipping 264 matching lines @@
     [touchBarItem
         setCustomizationLabel:l10n_util::GetNSString(
                                   IDS_TOUCH_BAR_BOOKMARK_CUSTOMIZATION_LABEL)];
   } else if ([identifier hasSuffix:kSearchTouchId]) {
     [touchBarItem setView:[self searchTouchBarView]];
     [touchBarItem setCustomizationLabel:l10n_util::GetNSString(
                                             IDS_TOUCH_BAR_GOOGLE_SEARCH)];
   } else if ([identifier hasSuffix:kFullscreenOriginLabelTouchId]) {
     content::WebContents* contents =
         browser_->tab_strip_model()->GetActiveWebContents();
-    GURL originUrl = contents->GetLastCommittedURL();
 
-    base::string16 displayText = base::ASCIIToUTF16(originUrl.spec());
+    if (!contents)
+      return nil;
+
+    // Strip the trailing slash.
+    url::Parsed parsed;
+    base::string16 displayText = url_formatter::FormatUrl(
+        contents->GetLastCommittedURL(),
+        url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname,
+        net::UnescapeRule::SPACES, &parsed, nullptr, nullptr);
+
     base::scoped_nsobject<NSMutableAttributedString> attributedString(
         [[NSMutableAttributedString alloc]
             initWithString:base::SysUTF16ToNSString(displayText)]);
 
-    if (originUrl.has_path()) {
-      size_t pathIndex = originUrl.GetWithEmptyPath().spec().length();
+    if (parsed.path.is_nonempty()) {
+      size_t pathIndex = parsed.path.begin;
       [attributedString
           addAttribute:NSForegroundColorAttributeName
                  value:OmniboxViewMac::BaseTextColor(true)
                  range:NSMakeRange(pathIndex,
                                    [attributedString length] - pathIndex)];
     }
 
     [touchBarItem
         setView:[NSTextField labelWithAttributedString:attributedString.get()]];
   } else if ([identifier hasSuffix:kExitFullscreenTouchId]) {
@@ skipping 139 matching lines @@
       ->ExitExclusiveAccessIfNecessary();
 }
 
 - (void)executeCommand:(id)sender {
   int command = [sender tag];
   LogTouchBarUMA(command);
   commandUpdater_->ExecuteCommand(command);
 }
 
 @end