[Extensions UI] Highlight toolbar extensions when the redesign bubble is active

chrome/browser/extensions/extension_toolbar_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_
 
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
@@ skipping 11 matching lines @@
 
 namespace extensions {
 class ExtensionRegistry;
 class ExtensionSet;
 
 // Model for the browser actions toolbar.
 class ExtensionToolbarModel : public ExtensionActionAPI::Observer,
                               public ExtensionRegistryObserver,
                               public KeyedService {
  public:
+  // The different options for highlighting.
+  enum HighlightType {
+    HIGHLIGHT_NONE,
+    HIGHLIGHT_INFO,
+    HIGHLIGHT_WARNING,
+  };
+
   ExtensionToolbarModel(Profile* profile, ExtensionPrefs* extension_prefs);
   ~ExtensionToolbarModel() override;
 
   // A class which is informed of changes to the model; represents the view of
   // MVC. Also used for signaling view changes such as showing extension popups.
   // TODO(devlin): Should this really be an observer? It acts more like a
   // delegate.
   class Observer {
    public:
     // Signals that an |extension| has been added to the toolbar at |index|.
@@ skipping 69 matching lines @@
         toolbar_items().size() :
         std::min(static_cast<size_t>(visible_icon_count_),
                  toolbar_items().size());
   }
 
   bool all_icons_visible() const { return visible_icon_count_ == -1; }
 
   bool extensions_initialized() const { return extensions_initialized_; }
 
   const ExtensionList& toolbar_items() const {
-    return is_highlighting_ ? highlighted_items_ : toolbar_items_;
+    return is_highlighting() ? highlighted_items_ : toolbar_items_;
   }
 
-  bool is_highlighting() const { return is_highlighting_; }
+  bool is_highlighting() const { return highlight_type_ != HIGHLIGHT_NONE; }
+  HighlightType highlight_type() const { return highlight_type_; }
 
   void OnExtensionToolbarPrefChange();
 
   // Returns the index of the given |id|, or -1 if the id wasn't found.
   int GetIndexForId(const std::string& id) const;
 
   // Finds the Observer associated with |browser| and tells it to display a
   // popup for the given |extension|. If |grant_active_tab| is true, this
   // grants active tab permissions to the |extension|; only do this because of
   // a direct user action.
   bool ShowExtensionActionPopup(const Extension* extension,
                                 Browser* browser,
                                 bool grant_active_tab);
 
   // Ensures that the extensions in the |extension_ids| list are visible on the
   // toolbar. This might mean they need to be moved to the front (if they are in
   // the overflow bucket).
   void EnsureVisibility(const ExtensionIdList& extension_ids);
 
   // Highlights the extensions specified by |extension_ids|. This will cause
   // the ToolbarModel to only display those extensions.
   // Highlighting mode is only entered if there is at least one extension to
   // be shown.
   // Returns true if highlighting mode is entered, false otherwise.
-  bool HighlightExtensions(const ExtensionIdList& extension_ids);
+  bool HighlightExtensions(const ExtensionIdList& extension_ids,
+                           HighlightType type);
 
   // Stop highlighting extensions. All extensions can be shown again, and the
   // number of visible icons will be reset to what it was before highlighting.
   void StopHighlighting();
 
   // Returns true if the toolbar model is running with the redesign and is
   // showing new icons as a result.
   bool RedesignIsShowingNewIcons() const;
 
  private:
@@ skipping 66 matching lines @@
   // If true, we include all extensions in the toolbar model. If false, we only
   // include browser actions.
   bool include_all_extensions_;
 
   // Ordered list of browser action buttons.
   ExtensionList toolbar_items_;
 
   // List of browser action buttons which should be highlighted.
   ExtensionList highlighted_items_;
 
-  // Indication whether or not we are currently in highlight mode; typically,
-  // this is equivalent to !highlighted_items_.empty(), but can be different
-  // if we are exiting highlight mode due to no longer having highlighted items.
-  bool is_highlighting_;
-
-  // The number of icons which were visible before highlighting a subset, in
-  // order to restore the count when finished.
-  int old_visible_icon_count_;
+  // The current type of highlight (with HIGHLIGHT_NONE indicating no current
+  // highlight).
+  HighlightType highlight_type_;
 
   ExtensionIdList last_known_positions_;
 
   // The number of icons visible (the rest should be hidden in the overflow
   // chevron). A value of -1 indicates that all icons should be visible.
   // Instead of using this variable directly, use visible_icon_count() if
   // possible.
   // TODO(devlin): Make a new variable to indicate that all icons should be
   // visible, instead of overloading this one.
   int visible_icon_count_;
@@ skipping 10 matching lines @@
   base::Closure pref_change_callback_;
 
   base::WeakPtrFactory<ExtensionToolbarModel> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarModel);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_