Support Component Actions in the toolbar.

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/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_message_bubble.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
 namespace {
@@ skipping 121 matching lines @@
   return *GetOrCreateExtensionList();
 }
 
 bool ExtensionMessageBubbleController::CloseOnDeactivate() { return false; }
 
 void ExtensionMessageBubbleController::HighlightExtensionsIfNecessary() {
   if (delegate_->ShouldHighlightExtensions() && !did_highlight_) {
     did_highlight_ = true;
     const ExtensionIdList& extension_ids = GetExtensionIdList();
     DCHECK(!extension_ids.empty());
-    ExtensionToolbarModel::Get(profile_)->HighlightExtensions(
-        extension_ids, ExtensionToolbarModel::HIGHLIGHT_WARNING);
+    ToolbarActionsModel::Get(profile_)->HighlightActions(
+        extension_ids, ToolbarActionsModel::HIGHLIGHT_WARNING);
   }
 }
 
 void ExtensionMessageBubbleController::Show(ExtensionMessageBubble* bubble) {
   bubble->Show();
 }
 
 void ExtensionMessageBubbleController::OnBubbleAction() {
   DCHECK_EQ(ACTION_BOUNDARY, user_action_);
   user_action_ = ACTION_EXECUTE;
@@ skipping 60 matching lines @@
     delegate_->LogExtensionCount(extension_list_.size());
     initialized_ = true;
   }
 
   return &extension_list_;
 }
 
 void ExtensionMessageBubbleController::OnClose() {
   AcknowledgeExtensions();
   if (did_highlight_)
-    ExtensionToolbarModel::Get(profile_)->StopHighlighting();
+    ToolbarActionsModel::Get(profile_)->StopHighlighting();
 }
 
 }  // namespace extensions