Implement Browser Actions extensions....

chrome/browser/extensions/extensions_service.cc

 // Copyright (c) 2009 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/extensions_service.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 126 matching lines @@
   LoadAllExtensions();
 
   // TODO(erikkay) this should probably be deferred to a future point
   // rather than running immediately at startup.
   CheckForExternalUpdates();
 
   // TODO(erikkay) this should probably be deferred as well.
   GarbageCollectExtensions();
 }
 
-std::vector<PageAction*> ExtensionsService::GetPageActions() const {
-  std::vector<PageAction*> result;
+std::vector<ContextualAction*> ExtensionsService::GetPageActions() const {
+  return GetContextualActions(ContextualAction::PAGE_ACTION);
+}
 
-  // TODO(finnur): Sort the page icons in some meaningful way.
-  for (ExtensionList::const_iterator iter = extensions_.begin();
-       iter != extensions_.end(); ++iter) {
-    const PageActionMap& page_actions = (*iter)->page_actions();
-    for (PageActionMap::const_iterator i(page_actions.begin());
-         i != page_actions.end(); ++i) {
-      result.push_back(i->second);
-    }
-  }
-
-  return result;
+std::vector<ContextualAction*> ExtensionsService::GetBrowserActions() const {
+  return GetContextualActions(ContextualAction::BROWSER_ACTION);
 }
 
 void ExtensionsService::InstallExtension(const FilePath& extension_path) {
   CrxInstaller::Start(extension_path, install_directory_, Extension::INTERNAL,
                       "",   // no expected id
                       false,  // don't delete crx when complete
                       true,  // allow privilege increase
                       backend_loop_,
                       this,
                       NULL);  // no client (silent install)
@@ skipping 154 matching lines @@
   OnExtensionLoaded(extension, true);
 
   if (location == Extension::EXTERNAL_PREF ||
       location == Extension::EXTERNAL_REGISTRY) {
     backend_loop_->PostTask(FROM_HERE, NewRunnableMethod(backend_.get(),
         &ExtensionsServiceBackend::CheckExternalUninstall,
         scoped_refptr<ExtensionsService>(this), id, location));
   }
 }
 
+std::vector<ContextualAction*> ExtensionsService::GetContextualActions(
+    ContextualAction::ContextualActionType action_type) const {
+  std::vector<ContextualAction*> result;
+
+  // TODO(finnur): Sort the icons in some meaningful way.
+  for (ExtensionList::const_iterator iter = extensions_.begin();
+       iter != extensions_.end(); ++iter) {
+    if (action_type == ContextualAction::PAGE_ACTION) {
+      const ContextualActionMap* page_actions = &(*iter)->page_actions();
+      for (ContextualActionMap::const_iterator i(page_actions->begin());
+           i != page_actions->end(); ++i) {
+        result.push_back(i->second);
+      }
+    } else {
+      ContextualAction* browser_action = (*iter)->browser_action();
+      if (browser_action)
+        result.push_back(browser_action);
+    }
+  }
+
+  return result;
+}
+
 void ExtensionsService::UpdateExtensionBlacklist(
   const std::vector<std::string>& blacklist) {
   // Use this set to indicate if an extension in the blacklist has been used.
   std::set<std::string> blacklist_set;
   for (unsigned int i = 0; i < blacklist.size(); ++i) {
     if (Extension::IdIsValid(blacklist[i])) {
       blacklist_set.insert(blacklist[i]);
     }
   }
   extension_prefs_->UpdateBlacklist(blacklist_set);
@@ skipping 407 matching lines @@
       linked_ptr<ExternalExtensionProvider>(test_provider);
 }
 
 void ExtensionsServiceBackend::OnExternalExtensionFound(
     const std::string& id, const Version* version, const FilePath& path,
     Extension::Location location) {
   frontend_loop_->PostTask(FROM_HERE, NewRunnableMethod(frontend_,
       &ExtensionsService::OnExternalExtensionFound, id, version->GetString(),
       path, location));
 }