Add infrastructure for Chrome Actions

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 62 matching lines @@
 }
 
 void ExtensionToolbarModel::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void ExtensionToolbarModel::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void ExtensionToolbarModel::MoveExtensionIcon(const Extension* extension,
+void ExtensionToolbarModel::MoveExtensionIcon(const std::string& id,
                                               size_t index) {
-  ExtensionList::iterator pos = std::find(toolbar_items_.begin(),
-      toolbar_items_.end(), extension);
+  ExtensionList::iterator pos = toolbar_items_.begin();
+  while (pos != toolbar_items_.end() && (*pos)->id() != id)
+    ++pos;
   if (pos == toolbar_items_.end()) {
     NOTREACHED();
     return;
   }
+  scoped_refptr<const Extension> extension = *pos;
   toolbar_items_.erase(pos);
 
   ExtensionIdList::iterator pos_id = std::find(last_known_positions_.begin(),
                                                last_known_positions_.end(),
-                                               extension->id());
+                                               id);
   if (pos_id != last_known_positions_.end())
     last_known_positions_.erase(pos_id);
 
   if (index < toolbar_items_.size()) {
     // If the index is not at the end, find the item currently at |index|, and
     // insert |extension| before it in both |toolbar_items_| and
     // |last_known_positions_|.
     ExtensionList::iterator iter = toolbar_items_.begin() + index;
     last_known_positions_.insert(std::find(last_known_positions_.begin(),
                                            last_known_positions_.end(),
                                            (*iter)->id()),
-                                 extension->id());
+                                 id);
     toolbar_items_.insert(iter, extension);
   } else {
     // Otherwise, put |extension| at the end.
     DCHECK_EQ(toolbar_items_.size(), index);
     index = toolbar_items_.size();
-    toolbar_items_.push_back(make_scoped_refptr(extension));
-    last_known_positions_.push_back(extension->id());
+    toolbar_items_.push_back(extension);
+    last_known_positions_.push_back(id);
   }
 
   FOR_EACH_OBSERVER(
-      Observer, observers_, ToolbarExtensionMoved(extension, index));
-  MaybeUpdateVisibilityPref(extension, index);
+      Observer, observers_, ToolbarExtensionMoved(extension.get(), index));
+  MaybeUpdateVisibilityPref(extension.get(), index);
   UpdatePrefs();
 }
 
 void ExtensionToolbarModel::SetVisibleIconCount(int count) {
   visible_icon_count_ =
       count == static_cast<int>(toolbar_items_.size()) ? -1 : count;
 
   // Only set the prefs if we're not in highlight mode and the profile is not
   // incognito. Highlight mode is designed to be a transitory state, and should
   //  not persist across browser restarts (though it may be re-entered), and we
@@ skipping 91 matching lines @@
     } else {
       // If we're hiding one, we must be showing at least one.
       DCHECK_NE(visible_icon_count_, 0);
       // Shrink the bar by one and move the extension to the beginning of the
       // overflow menu.
       new_size = visible_icon_count_ == -1 ?
                      toolbar_items_.size() - 1 : visible_icon_count_ - 1;
       new_index = new_size;
     }
     SetVisibleIconCount(new_size);
-    MoveExtensionIcon(extension, new_index);
+    MoveExtensionIcon(extension->id(), new_index);
   } else {  // Don't include all extensions.
     if (visible)
       AddExtension(extension);
     else
       RemoveExtension(extension);
   }
 }
 
 void ExtensionToolbarModel::OnReady() {
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile_);
@@ skipping 353 matching lines @@
   if (visible_icon_count_ == -1)
     return;  // May have been set to max by SetVisibleIconCount.
 
   // Guillotine's Delight: Move an orange noble to the front of the line.
   for (ExtensionIdList::const_iterator it = extension_ids.begin();
        it != extension_ids.end(); ++it) {
     for (ExtensionList::const_iterator extension = toolbar_items_.begin();
          extension != toolbar_items_.end(); ++extension) {
       if ((*extension)->id() == (*it)) {
         if (extension - toolbar_items_.begin() >= visible_icon_count_)
-          MoveExtensionIcon(extension->get(), 0);
+          MoveExtensionIcon((*extension)->id(), 0);
         break;
       }
     }
   }
 }
 
 bool ExtensionToolbarModel::HighlightExtensions(
     const ExtensionIdList& extension_ids) {
   highlighted_items_.clear();
 
@@ skipping 33 matching lines @@
   if (is_highlighting_) {
     highlighted_items_.clear();
     is_highlighting_ = false;
     if (old_visible_icon_count_ != visible_icon_count_)
       SetVisibleIconCount(old_visible_icon_count_);
     FOR_EACH_OBSERVER(Observer, observers_, ToolbarHighlightModeChanged(false));
   }
 }
 
 }  // namespace extensions