Make the fullscreen touchbar customizable

Users might not like the URL display on the touchbar in fullscreen.
This CL makes the fullscreen touchbar customizable. Right now, that
means that the user can add or remove the single item in it (the
URL display) but that should help for the case in the bug.

Fixed: 1135102
Change-Id: I99e3ca0d4d9d6575a0ec79ab3329e54613475e7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2464080
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Auto-Submit: Avi Drissman <avi@chromium.org>
Reviewed-by: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816197}

chrome/app/generated_resources.grd

@@ -2247,6 +2247,10 @@ are declared in tools/grit/grit_rule.gni.
                    desc="Customization label for the new tab button in the touch bar.">
           New Tab
         </message>
+        <message name="IDS_TOUCH_BAR_URL_CUSTOMIZATION_LABEL"
+                   desc="Customization label for the URL field in the touch bar.">
+          Page URL
+        </message>
       </if>
 
       <!-- Abandon in-progress downloads confirmation dialog -->

chrome/app/generated_resources_grd/IDS_TOUCH_BAR_URL_CUSTOMIZATION_LABEL.png.sha1

+6c6e424489528fd834c66f8eeb477cb5d49cd7c2
\ No newline at end of file

chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm

@@ -273,6 +273,9 @@ class API_AVAILABLE(macos(10.12.2)) TouchBarNotificationBridge
   base::scoped_nsobject<NSButton> _starredButton;
 }
 
+// Creates and returns a touch bar for tab non-fullscreen mode.
+- (NSTouchBar*)createTabTouchBar;
+
 // Creates and returns a touch bar for tab fullscreen mode.
 - (NSTouchBar*)createTabFullscreenTouchBar;
 
@@ -304,37 +307,7 @@ class API_AVAILABLE(macos(10.12.2)) TouchBarNotificationBridge
     return [self createTabFullscreenTouchBar];
   }
 
-  base::scoped_nsobject<NSTouchBar> touchBar([[NSTouchBar alloc] init]);
-  [touchBar
-      setCustomizationIdentifier:ui::GetTouchBarId(kBrowserWindowTouchBarId)];
-  [touchBar setDelegate:self];
-
-  NSMutableArray<NSString*>* customIdentifiers = [NSMutableArray array];
-  NSMutableArray<NSString*>* defaultIdentifiers = [NSMutableArray array];
-
-  NSArray<NSString*>* touchBarItems = @[
-    kBackTouchId, kForwardTouchId, kReloadOrStopTouchId, kHomeTouchId,
-    kSearchTouchId, kStarTouchId, kNewTabTouchId
-  ];
-
-  for (NSString* item in touchBarItems) {
-    NSString* itemIdentifier =
-        ui::GetTouchBarItemId(kBrowserWindowTouchBarId, item);
-    [customIdentifiers addObject:itemIdentifier];
-
-    // Don't add the home button if it's not shown in the toolbar.
-    if (item == kHomeTouchId && !_notificationBridge->show_home_button())
-      continue;
-
-    [defaultIdentifiers addObject:itemIdentifier];
-  }
-
-  [customIdentifiers addObject:NSTouchBarItemIdentifierFlexibleSpace];
-
-  [touchBar setDefaultItemIdentifiers:defaultIdentifiers];
-  [touchBar setCustomizationAllowedItemIdentifiers:customIdentifiers];
-
-  return touchBar.autorelease();
+  return [self createTabTouchBar];
 }
 
 - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
@@ -435,6 +408,9 @@ class API_AVAILABLE(macos(10.12.2)) TouchBarNotificationBridge
 
     [touchBarItem
         setView:[NSTextField labelWithAttributedString:attributedString.get()]];
+    [touchBarItem
+        setCustomizationLabel:l10n_util::GetNSString(
+                                  IDS_TOUCH_BAR_URL_CUSTOMIZATION_LABEL)];
   } else {
     return nil;
   }
@@ -442,12 +418,52 @@ class API_AVAILABLE(macos(10.12.2)) TouchBarNotificationBridge
   return touchBarItem.autorelease();
 }
 
+- (NSTouchBar*)createTabTouchBar {
+  base::scoped_nsobject<NSTouchBar> touchBar([[NSTouchBar alloc] init]);
+  [touchBar
+      setCustomizationIdentifier:ui::GetTouchBarId(kBrowserWindowTouchBarId)];
+  [touchBar setDelegate:self];
+
+  NSMutableArray<NSString*>* customIdentifiers = [NSMutableArray array];
+  NSMutableArray<NSString*>* defaultIdentifiers = [NSMutableArray array];
+
+  NSArray<NSString*>* touchBarItems = @[
+    kBackTouchId, kForwardTouchId, kReloadOrStopTouchId, kHomeTouchId,
+    kSearchTouchId, kStarTouchId, kNewTabTouchId
+  ];
+
+  for (NSString* item in touchBarItems) {
+    NSString* itemIdentifier =
+        ui::GetTouchBarItemId(kBrowserWindowTouchBarId, item);
+    [customIdentifiers addObject:itemIdentifier];
+
+    // Don't add the home button if it's not shown in the toolbar.
+    if (item == kHomeTouchId && !_notificationBridge->show_home_button())
+      continue;
+
+    [defaultIdentifiers addObject:itemIdentifier];
+  }
+
+  [customIdentifiers addObject:NSTouchBarItemIdentifierFlexibleSpace];
+
+  [touchBar setDefaultItemIdentifiers:defaultIdentifiers];
+  [touchBar setCustomizationAllowedItemIdentifiers:customIdentifiers];
+
+  return touchBar.autorelease();
+}
+
 - (NSTouchBar*)createTabFullscreenTouchBar {
   base::scoped_nsobject<NSTouchBar> touchBar([[NSTouchBar alloc] init]);
+  [touchBar
+      setCustomizationIdentifier:ui::GetTouchBarId(kTabFullscreenTouchBarId)];
   [touchBar setDelegate:self];
-  [touchBar setDefaultItemIdentifiers:@[ ui::GetTouchBarItemId(
-                                          kTabFullscreenTouchBarId,
-                                          kFullscreenOriginLabelTouchId) ]];
+
+  NSArray<NSString*>* touchBarItems = @[ ui::GetTouchBarItemId(
+      kTabFullscreenTouchBarId, kFullscreenOriginLabelTouchId) ];
+
+  [touchBar setDefaultItemIdentifiers:touchBarItems];
+  [touchBar setCustomizationAllowedItemIdentifiers:touchBarItems];
+
   return touchBar.autorelease();
 }