Support Component Actions in the toolbar.

chrome/browser/extensions/extension_message_bubble_controller.cc

Index: chrome/browser/extensions/extension_message_bubble_controller.cc
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc
index 278ad8ddaa287421a88c5a5e747e493a44138617..f9a7ffb5c6cb915d1123afdb466e30d461de7f95 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller.cc
@@ -10,10 +10,10 @@
 #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"
@@ -155,8 +155,8 @@ void ExtensionMessageBubbleController::HighlightExtensionsIfNecessary() {
     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);
   }
 }
 
@@ -237,7 +237,7 @@ ExtensionIdList* ExtensionMessageBubbleController::GetOrCreateExtensionList() {
 void ExtensionMessageBubbleController::OnClose() {
   AcknowledgeExtensions();
   if (did_highlight_)
-    ExtensionToolbarModel::Get(profile_)->StopHighlighting();
+    ToolbarActionsModel::Get(profile_)->StopHighlighting();
 }
 
 }  // namespace extensions