Support Component Actions in the toolbar.

chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.cc

 // 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.
 
 #include "chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/time.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/common/pref_names.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 void AcknowledgeInPrefs(PrefService* prefs) {
   prefs->SetBoolean(prefs::kToolbarIconSurfacingBubbleAcknowledged, true);
@@ skipping 25 matching lines @@
     return false;
 
   // We don't show more than once per day.
   if (prefs->HasPrefPath(prefs::kToolbarIconSurfacingBubbleLastShowTime)) {
     base::Time last_shown_time = base::Time::FromInternalValue(
         prefs->GetInt64(prefs::kToolbarIconSurfacingBubbleLastShowTime));
     if (base::Time::Now() - last_shown_time < base::TimeDelta::FromDays(1))
       return false;
   }
 
-  if (!extensions::ExtensionToolbarModel::Get(profile)->
-          RedesignIsShowingNewIcons()) {
+  if (!ToolbarActionsModel::Get(profile)->RedesignIsShowingNewIcons()) {
     // We only show the bubble if there are any new icons present - otherwise,
     // the user won't see anything different, so we treat it as acknowledged.
     AcknowledgeInPrefs(prefs);
     return false;
   }
 
   return true;
 }
 
 base::string16 ExtensionToolbarIconSurfacingBubbleDelegate::GetHeadingText() {
@@ skipping 27 matching lines @@
   // Record the last time the bubble was shown.
   profile_->GetPrefs()->SetInt64(
       prefs::kToolbarIconSurfacingBubbleLastShowTime,
       base::Time::Now().ToInternalValue());
 }
 
 void ExtensionToolbarIconSurfacingBubbleDelegate::OnBubbleClosed(
     CloseAction action) {
   if (action == CLOSE_EXECUTE)
     AcknowledgeInPrefs(profile_->GetPrefs());
-  extensions::ExtensionToolbarModel::Get(profile_)->StopHighlighting();
+  ToolbarActionsModel::Get(profile_)->StopHighlighting();
 }