[Reland] [Extensions] Make extension message bubble factory platform-abstract

chrome/browser/extensions/extension_toolbar_model.cc

 // Copyright (c) 2012 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/extensions/extension_toolbar_model.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 699 matching lines @@
          ++extension) {
       if (*id == (*extension)->id())
         highlighted_items_.push_back(*extension);
     }
   }
 
   // If we have any items in |highlighted_items_|, then we entered highlighting
   // mode.
   if (highlighted_items_.size()) {
     old_visible_icon_count_ = visible_icon_count_;
-    is_highlighting_ = true;
     if (visible_icon_count() < extension_ids.size())
       SetVisibleIconCount(extension_ids.size());
 
+    // It's important that is_highlighting_ is changed right immediately before
+    // the observers are notified since it changes the result of
+    // toolbar_items().
+    is_highlighting_ = true;
     FOR_EACH_OBSERVER(Observer, observers_,
                       OnToolbarHighlightModeChanged(true));
     return true;
   }
 
   // Otherwise, we didn't enter highlighting mode (and, in fact, exited it if
   // we were otherwise in it).
   if (is_highlighting_)
     StopHighlighting();
   return false;
 }
 
 void ExtensionToolbarModel::StopHighlighting() {
   if (is_highlighting_) {
     highlighted_items_.clear();
-    is_highlighting_ = false;
     if (old_visible_icon_count_ != visible_icon_count_)
       SetVisibleIconCount(old_visible_icon_count_);
+
+    // It's important that is_highlighting_ is changed right immediately before
+    // the observers are notified since it changes the result of
+    // toolbar_items().
+    is_highlighting_ = false;
     FOR_EACH_OBSERVER(Observer, observers_,
                       OnToolbarHighlightModeChanged(false));
   }
 }
 
 bool ExtensionToolbarModel::RedesignIsShowingNewIcons() const {
   for (const scoped_refptr<const Extension>& extension : toolbar_items_) {
     // Without the redesign, we only show extensions with browser actions.
     // Any extension without a browser action is an indication that we're
     // showing something new.
     if (!extension->manifest()->HasKey(manifest_keys::kBrowserAction))
       return true;
   }
   return false;
 }
 
 }  // namespace extensions