Refactor implementation of BrowserActions, and add support for

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 123 matching lines @@
 
   // 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<ExtensionAction*> ExtensionsService::GetPageActions() const {
-  return GetExtensionActions(ExtensionAction::PAGE_ACTION, true);
-}
+  std::vector<ExtensionAction*> result;
 
-std::vector<ExtensionAction*> ExtensionsService::GetBrowserActions(
-    bool include_popups) const {
-  return GetExtensionActions(ExtensionAction::BROWSER_ACTION, include_popups);
+  // TODO(finnur): Sort the icons in some meaningful way.
+  for (ExtensionList::const_iterator iter = extensions_.begin();
+       iter != extensions_.end(); ++iter) {
+    if ((*iter)->page_action())
+      result.push_back((*iter)->page_action());
+  }
+
+  return result;
 }
 
 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 196 matching lines @@
         profile_->GetRequestContext());
     if (context) {
       g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
           NewRunnableMethod(context,
                             &ChromeURLRequestContext::OnUnloadedExtension,
                             extension->id()));
     }
   }
 }
 
-std::vector<ExtensionAction*> ExtensionsService::GetExtensionActions(
-    ExtensionAction::ExtensionActionType action_type,
-    bool include_popups) const {
-  std::vector<ExtensionAction*> result;
-
-  // TODO(finnur): Sort the icons in some meaningful way.
-  for (ExtensionList::const_iterator iter = extensions_.begin();
-       iter != extensions_.end(); ++iter) {
-    if (action_type == ExtensionAction::PAGE_ACTION) {
-      ExtensionAction* page_action = (*iter)->page_action();
-      if (page_action && (include_popups || !page_action->is_popup())) {
-        result.push_back(page_action);
-      }
-    } else {
-      ExtensionAction* browser_action = (*iter)->browser_action();
-      if (browser_action && (include_popups || !browser_action->is_popup()))
-        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 442 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));
 }