[Extensions Toolbar] Make the ExtensionToolbarModel icon count more stable

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 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/views/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 108 matching lines @@
   // All views should be removed as part of ToolbarActionsBar::DeleteActions().
   DCHECK(toolbar_action_views_.empty());
 }
 
 void BrowserActionsContainer::Init() {
   LoadImages();
 
   // We wait to set the container width until now so that the chevron images
   // will be loaded.  The width calculation needs to know the chevron size.
   container_width_ = toolbar_actions_bar_->GetPreferredSize().width();
-
-  initialized_ = true;
 }
 
 const std::string& BrowserActionsContainer::GetIdAt(size_t index) {
   return toolbar_action_views_[index]->view_controller()->GetId();
 }
 
 ToolbarActionView* BrowserActionsContainer::GetViewForId(
     const std::string& id) {
   for (ToolbarActionView* view : toolbar_action_views_) {
     if (view->view_controller()->GetId() == id)
@@ skipping 73 matching lines @@
   // this container.
   ToolbarActionViews::const_iterator iter =
       std::find(toolbar_action_views_.begin(),
                 toolbar_action_views_.end(),
                 view);
   DCHECK(iter != toolbar_action_views_.end());
   size_t index = iter - toolbar_action_views_.begin();
   return main_container_->toolbar_action_views_[index];
 }
 
+bool BrowserActionsContainer::IsReady() const {
+  return initialized_;

[Peter Kasting, 2014/11/14 21:31:58]

So what happens if we allow additions at any time?  It seems like in theory that
ought to actually work.

[Devlin, 2014/11/14 22:00:38]

Hmm.  I think I misread the comment on line 734, and interpreted it to mean "We
cannot add views until ViewHierarchyChanged".  So yes, I think we should be able
to add views at any time (and this appears to work in testing).

Well, that cleans things up nicely. :)  Thanks for catching it!

+}
+
 void BrowserActionsContainer::AddViewForAction(
    ToolbarActionViewController* view_controller,
    size_t index) {
   if (chevron_)
     chevron_->CloseMenu();
 
       view_controller->GetActionName();
   ToolbarActionView* view =
       new ToolbarActionView(view_controller, browser_, this);
   toolbar_action_views_.insert(toolbar_action_views_.begin() + index, view);
@@ skipping 486 matching lines @@
 
   if (details.is_add && details.child == this) {
     if (!in_overflow_mode()) {  // We only need one keybinding registry.
       extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(
           browser_->profile(),
           parent()->GetFocusManager(),
           extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS,
           this));
     }
 
+    initialized_ = true;

[Peter Kasting, 2014/11/14 21:31:58]

This seems suspicious.  Why do we have to set this both in Init() and here? 
Seems like we should only have one or the other.

Can we remove Init() entirely?

[Devlin, 2014/11/14 22:00:37]

We still need Init(), but we actually don't need initialized_, I think.  Cool.

+
     // Initial toolbar button creation and placement in the widget hierarchy.
     // We do this here instead of in the constructor because adding views
     // calls Layout on the Toolbar, which needs this object to be constructed
     // before its Layout function is called.
     toolbar_actions_bar_->CreateActions();
   }
 }
 
 void BrowserActionsContainer::LoadImages() {
   if (in_overflow_mode())
     return;  // Overflow mode has neither a chevron nor highlighting.
 
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp && chevron_) {
     chevron_->SetImage(views::Button::STATE_NORMAL,
                        *tp->GetImageSkiaNamed(IDR_BROWSER_ACTIONS_OVERFLOW));
   }
 
   const int kImages[] = IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT);
   highlight_painter_.reset(views::Painter::CreateImageGridPainter(kImages));
 }