| Index: chrome/browser/ui/toolbar/toolbar_actions_bar.cc
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
|
| index d60b27b960cc304c4dbace88b83b171766cd7323..73b094ead90e22f44a7900e436429a6485722891 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
|
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
|
| @@ -678,9 +678,11 @@ void ToolbarActionsBar::OnToolbarActionRemoved(const std::string& action_id) {
|
| // because the icon is just going to get re-added to the same location.
|
| // There is an exception if this is an off-the-record profile, and the
|
| // extension is no longer incognito-enabled.
|
| - if (!extensions::ExtensionSystem::Get(browser_->profile())
|
| - ->runtime_data()
|
| - ->IsBeingUpgraded(action_id) ||
|
| + if (ComponentToolbarActionsFactory::GetInstance()
|
| + ->IsComponentActionId(action_id) ||
|
| + !extensions::ExtensionSystem::Get(browser_->profile())
|
| + ->runtime_data()
|
| + ->IsBeingUpgraded(action_id) ||
|
| (browser_->profile()->IsOffTheRecord() &&
|
| !extensions::util::IsIncognitoEnabled(action_id, browser_->profile()))) {
|
| if (toolbar_actions_.size() > model_->visible_icon_count()) {
|
|
|