[Extensions UI Mac] Fix race condition in showing the icon surfacing bubble

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2012 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/extensions/browser_actions_controller.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 361 matching lines @@
     }
 
     if (isOverflow_)
       toolbarActionsBar_->SetOverflowRowWidth(NSWidth([containerView_ frame]));
 
     buttons_.reset([[NSMutableArray alloc] init]);
     toolbarActionsBar_->CreateActions();
     [self showChevronIfNecessaryInFrame:[containerView_ frame]];
     [self updateGrippyCursors];
     [container setIsOverflow:isOverflow_];
-    if (ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
-            browser_->profile())) {
-      [containerView_ setTrackingEnabled:YES];
-      [[NSNotificationCenter defaultCenter]
-          addObserver:self
-             selector:@selector(containerMouseEntered:)
-                 name:kBrowserActionsContainerMouseEntered
-               object:containerView_];
-    }
 
     focusedViewIndex_ = -1;
   }
 
   return self;
 }
 
 - (void)dealloc {
   [self browserWillBeDestroyed];
   [super dealloc];
@@ skipping 164 matching lines @@
   if (toolbarActionsBar_->is_highlighting()) {
     if (toolbarActionsBar_->highlight_type() ==
         ToolbarActionsModel::HIGHLIGHT_INFO)
       highlight.reset(
           new ui::NinePartImageIds(IMAGE_GRID(IDR_TOOLBAR_ACTION_HIGHLIGHT)));
     else
       highlight.reset(
           new ui::NinePartImageIds(IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT)));
   }
   [containerView_ setHighlight:std::move(highlight)];
+  if (toolbarActionsBar_->show_icon_surfacing_bubble() &&
+      ![containerView_ trackingEnabled]) {
+    [containerView_ setTrackingEnabled:YES];
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+           selector:@selector(containerMouseEntered:)
+               name:kBrowserActionsContainerMouseEntered
+             object:containerView_];
+  }
 
   std::vector<ToolbarActionViewController*> toolbar_actions =
       toolbarActionsBar_->GetActions();
   for (NSUInteger i = 0; i < [buttons_ count]; ++i) {
     ToolbarActionViewController* controller =
         [[self buttonAtIndex:i] viewController];
     if (controller != toolbar_actions[i]) {
       size_t j = i + 1;
       while (true) {
         ToolbarActionViewController* other_controller =
@@ skipping 467 matching lines @@
 }
 
 #pragma mark -
 #pragma mark Testing Methods
 
 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index {
   return index < [buttons_ count] ? [buttons_ objectAtIndex:index] : nil;
 }
 
 @end