[Extensions UI] Convert ExtensionMessageBubbles to ToolbarActionsBarBubbles

chrome/browser/extensions/extension_message_bubble_controller.cc

 // Copyright (c) 2013 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.
 
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 89 matching lines @@
     Delegate* delegate,
     Browser* browser)
     : browser_(browser),
       user_action_(ACTION_BOUNDARY),
       delegate_(delegate),
       initialized_(false),
       did_highlight_(false) {
 }
 
 ExtensionMessageBubbleController::~ExtensionMessageBubbleController() {
+  if (did_highlight_)
+    ToolbarActionsModel::Get(profile())->StopHighlighting();
 }
 
 Profile* ExtensionMessageBubbleController::profile() {
   return browser_->profile();
 }
 
 bool ExtensionMessageBubbleController::ShouldShow() {
   std::set<Profile*>* profiles = GetProfileSet();
   return !profiles->count(profile()->GetOriginalProfile()) &&
          !GetExtensionList().empty();
@@ skipping 145 matching lines @@
 void ExtensionMessageBubbleController::OnClose() {
   DCHECK_NE(ACTION_BOUNDARY, user_action_);
   // If the bubble was closed due to deactivation, don't treat it as
   // acknowledgment so that the user will see the bubble again (until they
   // explicitly take an action).
   if (user_action_ != ACTION_DISMISS_DEACTIVATION) {
     AcknowledgeExtensions();
     if (delegate_->ClearProfileSetAfterAction())
       GetProfileSet()->clear();
   }
-
-  if (did_highlight_)
-    ToolbarActionsModel::Get(profile())->StopHighlighting();
 }
 
 std::set<Profile*>* ExtensionMessageBubbleController::GetProfileSet() {
   return &g_shown_for_profiles.Get()[delegate_->GetKey()];
 }
 
 }  // namespace extensions