[Mac] Fix for Tab Fullscreen Touch Bar

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 40 matching lines @@
   FORWARD,
   STOP,
   RELOAD,
   HOME,
   SEARCH,
   STAR,
   NEW_TAB,
   TOUCH_BAR_ACTION_COUNT
 };
 
-// The touch bar's identifier.
+// Touch bar identifiers.
 NSString* const kBrowserWindowTouchBarId = @"browser-window";
+NSString* const kTabFullscreenTouchBarId = @"tab-fullscreen";
 
 // Touch bar items identifiers.
 NSString* const kBackForwardTouchId = @"BACK-FWD";
 NSString* const kReloadOrStopTouchId = @"RELOAD-STOP";
 NSString* const kHomeTouchId = @"HOME";
 NSString* const kSearchTouchId = @"SEARCH";
 NSString* const kStarTouchId = @"BOOKMARK";
 NSString* const kNewTabTouchId = @"NEW-TAB";
 NSString* const kExitFullscreenTouchId = @"EXIT-FULLSCREEN";
 NSString* const kFullscreenOriginLabelTouchId = @"FULLSCREEN-ORIGIN-LABEL";
@@ skipping 28 matching lines @@
                                SkColor color = kTouchBarDefaultIconColor) {
   NSButton* button =
       [NSButton buttonWithImage:CreateNSImageFromIcon(icon, color)
                          target:owner
                          action:@selector(executeCommand:)];
   button.tag = command;
   [button setAccessibilityLabel:l10n_util::GetNSString(tooltip_id)];
   return button;
 }
 
-NSString* GetTouchBarId() {
+NSString* GetTouchBarId(NSString* touch_bar_id) {
   NSString* chrome_bundle_id =
       base::SysUTF8ToNSString(base::mac::BaseBundleID());
-  return [NSString
-      stringWithFormat:@"%@.%@", chrome_bundle_id, kBrowserWindowTouchBarId];
+  return [NSString stringWithFormat:@"%@.%@", chrome_bundle_id, touch_bar_id];
 }
 
 TouchBarAction TouchBarActionFromCommand(int command) {
   switch (command) {
     case IDC_BACK:
       return TouchBarAction::BACK;
     case IDC_FORWARD:
       return TouchBarAction::FORWARD;
     case IDC_STOP:
       return TouchBarAction::STOP;
@@ skipping 48 matching lines @@
 
   BrowserWindowController* bwc_;  // Weak, own us.
 
   // Used to monitor the optional home button pref.
   BooleanPrefMember showHomeButton_;
 
   // Used to receive and handle notifications for the home button pref.
   std::unique_ptr<HomePrefNotificationBridge> notificationBridge_;
 }
 
-// Creates and return the back and forward segmented buttons.
+// Creates and returns a touch bar for tab fullscreen mode.
+- (NSTouchBar*)createTabFullscreenTouchBar;
+
+// Creates and returns the back and forward segmented buttons.
 - (NSView*)backOrForwardTouchBarView;
 
 // Creates and returns the search button.
 - (NSView*)searchTouchBarView;
 @end
 
 @implementation BrowserWindowTouchBar
 
 @synthesize isPageLoading = isPageLoading_;
 @synthesize isStarred = isStarred_;
 
-+ (NSString*)touchBarIdForItemId:(NSString*)id {
-  return [NSString stringWithFormat:@"%@-%@", GetTouchBarId(), id];
++ (NSString*)identifierForTouchBarId:(NSString*)touchBarId
+                              itemId:(NSString*)itemId {
+  return
+      [NSString stringWithFormat:@"%@-%@", GetTouchBarId(touchBarId), itemId];
 }
 
 - (instancetype)initWithBrowser:(Browser*)browser
         browserWindowController:(BrowserWindowController*)bwc {
   if ((self = [self init])) {
     DCHECK(browser);
     commandUpdater_ = browser->command_controller()->command_updater();
     browser_ = browser;
     bwc_ = bwc;
 
     notificationBridge_.reset(new HomePrefNotificationBridge(bwc_));
     PrefService* prefs = browser->profile()->GetPrefs();
     showHomeButton_.Init(
         prefs::kShowHomeButton, prefs,
         base::Bind(&HomePrefNotificationBridge::UpdateTouchBar,
                    base::Unretained(notificationBridge_.get())));
   }
 
   return self;
 }
 
 - (NSTouchBar*)makeTouchBar {
   if (!base::FeatureList::IsEnabled(features::kBrowserTouchBar))
     return nil;
 
+  // When in tab fullscreen, we should show a touch bar containing only
+  // items associated with that mode. Since the toolbar is hidden, only
+  // the option to exit fullscreen should show up.
+  if ([bwc_ isFullscreenForTabContentOrExtension])
+    return [self createTabFullscreenTouchBar];
+
   base::scoped_nsobject<NSTouchBar> touchBar(
       [[NSClassFromString(@"NSTouchBar") alloc] init]);
-  [touchBar setCustomizationIdentifier:GetTouchBarId()];
+  [touchBar setCustomizationIdentifier:GetTouchBarId(kBrowserWindowTouchBarId)];
   [touchBar setDelegate:self];
 
-  // When in tab fullscreen, only the option to exit fullscreen should show up
-  // on the touch bar since the toolbar is hidden in that state.
-  if ([bwc_ isFullscreenForTabContentOrExtension]) {
-    if ([touchBar respondsToSelector:
-        @selector(setEscapeKeyReplacementItemIdentifier:)]) {
-      [touchBar setEscapeKeyReplacementItemIdentifier:
-                    [BrowserWindowTouchBar
-                        touchBarIdForItemId:kExitFullscreenTouchId]];
-      [touchBar setDefaultItemIdentifiers:@[
-        [BrowserWindowTouchBar
-            touchBarIdForItemId:kFullscreenOriginLabelTouchId]
-      ]];
-    }
-    return touchBar.autorelease();
-  }
-
   NSMutableArray* customIdentifiers = [NSMutableArray arrayWithCapacity:7];
   NSMutableArray* defaultIdentifiers = [NSMutableArray arrayWithCapacity:6];
 
   NSArray* touchBarItems = @[
     kBackForwardTouchId, kReloadOrStopTouchId, kHomeTouchId, kSearchTouchId,
     kStarTouchId, kNewTabTouchId
   ];
 
   for (NSString* item in touchBarItems) {
-    NSString* itemIdentifier = [BrowserWindowTouchBar touchBarIdForItemId:item];
+    NSString* itemIdentifier =
+        [BrowserWindowTouchBar identifierForTouchBarId:kBrowserWindowTouchBarId
+                                                itemId:item];
     [customIdentifiers addObject:itemIdentifier];
 
     // Don't add the home button if it's not shown in the toolbar.
     if (showHomeButton_.GetValue() || ![item isEqualTo:kHomeTouchId])
       [defaultIdentifiers addObject:itemIdentifier];
   }
 
   [customIdentifiers addObject:NSTouchBarItemIdentifierFlexibleSpace];
 
   [touchBar setDefaultItemIdentifiers:defaultIdentifiers];
@@ skipping 73 matching lines @@
                value:OmniboxViewMac::BaseTextColor(true)
                range:NSMakeRange(hostLength,
                                  [attributedString length] - hostLength)];
     [touchBarItem
         setView:[NSTextField labelWithAttributedString:attributedString.get()]];
   }
 
   return touchBarItem.autorelease();
 }
 
+- (NSTouchBar*)createTabFullscreenTouchBar {
+  base::scoped_nsobject<NSTouchBar> touchBar(
+      [[NSClassFromString(@"NSTouchBar") alloc] init]);
+  [touchBar setDelegate:self];
+
+  if ([touchBar respondsToSelector:@selector
+                (setEscapeKeyReplacementItemIdentifier:)]) {
+    [touchBar setEscapeKeyReplacementItemIdentifier:
+                  [BrowserWindowTouchBar
+                      identifierForTouchBarId:kTabFullscreenTouchBarId
+                                       itemId:kExitFullscreenTouchId]];
+    [touchBar setDefaultItemIdentifiers:@[
+      [BrowserWindowTouchBar
+          identifierForTouchBarId:kTabFullscreenTouchBarId
+                           itemId:kFullscreenOriginLabelTouchId]
+    ]];
+  }
+
+  return touchBar.autorelease();
+}
+
 - (NSView*)backOrForwardTouchBarView {
   NSArray* images = @[
     CreateNSImageFromIcon(ui::kBackArrowIcon),
     CreateNSImageFromIcon(ui::kForwardArrowIcon)
   ];
 
   NSSegmentedControl* control = [NSSegmentedControl
       segmentedControlWithImages:images
                     trackingMode:NSSegmentSwitchTrackingMomentary
                           target:self
@@ skipping 75 matching lines @@
       ->ExitExclusiveAccessIfNecessary();
 }
 
 - (void)executeCommand:(id)sender {
   int command = [sender tag];
   LogTouchBarUMA(command);
   commandUpdater_->ExecuteCommand(command);
 }
 
 @end