[Reland][Extensions] Don't count bubble focus loss as acknowledgment

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

 // Copyright 2015 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/toolbar_actions_bar_bubble_mac.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
@@ skipping 88 matching lines @@
 - (IBAction)showWindow:(id)sender {
   delegate_->OnBubbleShown();
   [super showWindow:sender];
 }
 
 // Private /////////////////////////////////////////////////////////////////////
 
 - (void)windowWillClose:(NSNotification*)notification {
   if (!acknowledged_) {
     delegate_->OnBubbleClosed(
-        ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS);
+        ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION);
     acknowledged_ = YES;
   }
   [super windowWillClose:notification];
 }
 
 - (NSAttributedString*)attributedStringWithString:(const base::string16&)string
                                          fontSize:(CGFloat)fontSize
                                         alignment:(NSTextAlignment)alignment {
   NSString* cocoaString = base::SysUTF16ToNSString(string);
   base::scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
@@ skipping 200 matching lines @@
 }
 
 - (void)onButtonClicked:(id)sender {
   if (acknowledged_)
     return;
   ToolbarActionsBarBubbleDelegate::CloseAction action =
       ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE;
   if (learnMoreButton_ && sender == learnMoreButton_) {
     action = ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE;
   } else if (dismissButton_ && sender == dismissButton_) {
-    action = ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS;
+    action = ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION;
   } else {
     DCHECK_EQ(sender, actionButton_);
     action = ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE;
   }
   acknowledged_ = YES;
   delegate_->OnBubbleClosed(action);
   [self close];
 }
 
 @end