Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6301)

Unified Diff: chrome/browser/ui/toolbar/toolbar_actions_bar.cc

Issue 2450633004: Make ToolbarActionsModel ignore calls to AddComponentAction() before initialization (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8d06aa097e7459bcc6b7f63e005a30128c83c71f..a757dd458011ad571e2bf9e5eb631167688f13e0 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
@@ -252,7 +252,7 @@ size_t ToolbarActionsBar::GetIconCount() const {
// 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());
}
@@ -338,7 +338,7 @@ ToolbarActionsBar::GetActions() const {
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;
{
@@ -633,7 +633,7 @@ void ToolbarActionsBar::set_extension_bubble_appearance_wait_time_for_testing(
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";
@@ -740,7 +740,7 @@ void ToolbarActionsBar::ResizeDelegate(gfx::Tween::Type tween_type,
}
void ToolbarActionsBar::OnToolbarHighlightModeChanged(bool is_highlighting) {
- if (!model_->actions_initialized())
+ if (!model_->ActionsInitialized())
return;
{

Powered by Google App Engine
This is Rietveld 408576698