Make ToolbarActionsModel ignore calls to AddComponentAction() before initialization

chrome/browser/ui/toolbar/toolbar_actions_bar.cc

 // Copyright 2014 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/toolbar/toolbar_actions_bar.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 234 matching lines @@
   // want to "slide" the action back in.
   size_t visible_icons = in_overflow_mode() ?
       toolbar_actions_.size() - model_->visible_icon_count() :
       model_->visible_icon_count() + pop_out_modifier;
 
 #if DCHECK_IS_ON()
   // Good time for some sanity checks: We should never try to display more
   // icons than we have, and we should always have a view per item in the model.
   // (The only exception is if this is in initialization.)
   if (!toolbar_actions_.empty() && !suppress_layout_ &&
-      model_->actions_initialized()) {
+      model_->ActionsInitialized()) {
     DCHECK_LE(visible_icons, toolbar_actions_.size());
     DCHECK_EQ(model_->toolbar_items().size(), toolbar_actions_.size());
   }
 #endif
 
   return visible_icons;
 }
 
 size_t ToolbarActionsBar::GetStartIndexInBounds() const {
   return in_overflow_mode() ? main_bar_->GetEndIndexInBounds() : 0;
@@ skipping 65 matching lines @@
                   actions.rend() - visible + 1);
     }
   }
 
   return actions;
 }
 
 void ToolbarActionsBar::CreateActions() {
   CHECK(toolbar_actions_.empty());
   // If the model isn't initialized, wait for it.
-  if (!model_ || !model_->actions_initialized())
+  if (!model_ || !model_->ActionsInitialized())
     return;
 
   {
     // TODO(robliao): Remove ScopedTracker below once https://crbug.com/463337
     // is fixed.
     tracked_objects::ScopedTracker tracking_profile1(
         FROM_HERE_WITH_EXPLICIT_FUNCTION("ToolbarActionsBar::CreateActions1"));
     // We don't redraw the view while creating actions.
     base::AutoReset<bool> layout_resetter(&suppress_layout_, true);
 
@@ skipping 274 matching lines @@
 
 // static
 void ToolbarActionsBar::set_extension_bubble_appearance_wait_time_for_testing(
     int time_in_seconds) {
   g_extension_bubble_appearance_wait_time_in_seconds = time_in_seconds;
 }
 
 void ToolbarActionsBar::OnToolbarActionAdded(
     const ToolbarActionsModel::ToolbarItem& item,
     int index) {
-  CHECK(model_->actions_initialized());
+  CHECK(model_->ActionsInitialized());
   CHECK(GetActionForId(item.id) == nullptr)
       << "Asked to add a toolbar action view for an action that already "
          "exists";
 
   toolbar_actions_.insert(toolbar_actions_.begin() + index,
                           model_->CreateActionForItem(browser_, this, item));
   delegate_->AddViewForAction(toolbar_actions_[index], index);
 
   // We may need to resize (e.g. to show the new icon, or the chevron). We don't
   // need to check if an extension is upgrading here, because ResizeDelegate()
@@ skipping 86 matching lines @@
     // icons within the toolbar may have changed (e.g. if we removed one
     // action and added a different one in quick succession).
     delegate_->Redraw(false);
   }
 
   for (ToolbarActionsBarObserver& observer : observers_)
     observer.OnToolbarActionsBarDidStartResize();
 }
 
 void ToolbarActionsBar::OnToolbarHighlightModeChanged(bool is_highlighting) {
-  if (!model_->actions_initialized())
+  if (!model_->ActionsInitialized())
     return;
 
   {
     base::AutoReset<bool> layout_resetter(&suppress_layout_, true);
     base::AutoReset<bool> animation_resetter(&suppress_animation_, true);
     std::set<std::string> seen;
     for (const ToolbarActionsModel::ToolbarItem item :
          model_->toolbar_items()) {
       auto current_pos =
           std::find_if(toolbar_actions_.begin(), toolbar_actions_.end(),
@@ skipping 68 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == action_id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }