[Extensions UI Mac] Fix a bug with popped out actions' highlighted state

chrome/browser/ui/cocoa/extensions/browser_action_button.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_action_button.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 151 matching lines @@
   [owner_ updateHighlightedState];
 }
 
 void ToolbarActionViewDelegateBridge::DoShowContextMenu() {
   // The point the menu shows matches that of the normal app menu - that is, the
   // right-left most corner of the menu is left-aligned with the app button,
   // and the menu is displayed "a little bit" lower. It would be nice to be able
   // to avoid the magic '5' here, but since it's built into Cocoa, it's not too
   // hopeful.
   NSPoint menuPoint = NSMakePoint(0, NSHeight([owner_ bounds]) + 5);
-  base::WeakPtr<ToolbarActionViewDelegateBridge> weak_this;
+  base::WeakPtr<ToolbarActionViewDelegateBridge> weakThis =
+      weakFactory_.GetWeakPtr();

[Devlin, 2016/04/14 18:54:35]

D'oh. :(

[Avi (use Gerrit), 2016/04/14 19:08:31]

hahasob

   [[owner_ cell] setHighlighted:YES];
   [[owner_ menu] popUpMenuPositioningItem:nil
                                atLocation:menuPoint
                                    inView:owner_];
   // Since menus run in a blocking way, it's possible that the extension was
   // unloaded since this point.
-  if (!weak_this)
+  if (!weakThis)
     return;
   [[owner_ cell] setHighlighted:NO];
   contextMenuRunning_ = false;
 }
 
 @implementation BrowserActionButton
 
 @synthesize isBeingDragged = isBeingDragged_;
 
 + (Class)cellClass {
@@ skipping 343 matching lines @@
 
 - (void)setTestContextMenu:(NSMenu*)testContextMenu {
   testContextMenu_ = testContextMenu;
 }
 
 - (BOOL)wantsToRunForTesting {
   return viewController_->WantsToRun(
       [browserActionsController_ currentWebContents]);
 }
 
+- (BOOL)isHighlighted {
+  return [[self cell] isHighlighted];
+}
+
 @end
 
 @implementation BrowserActionCell
 
 @synthesize browserActionsController = browserActionsController_;
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   [super drawWithFrame:cellFrame inView:controlView];
 
@@ skipping 21 matching lines @@
 - (const ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
   const ui::ThemeProvider* themeProvider = [window themeProvider];
   if (!themeProvider)
     themeProvider =
         [[browserActionsController_ browser]->window()->GetNativeWindow()
             themeProvider];
   return themeProvider;
 }
 
 @end