Move ExtensionAction from common/ to browser/.

chrome/browser/extensions/extension_service.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_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/tuple.h"
 #include "chrome/browser/api/prefs/pref_change_registrar.h"
 #include "chrome/browser/extensions/app_shortcut_manager.h"
 #include "chrome/browser/extensions/app_sync_bundle.h"
+#include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_sync_bundle.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/extensions/extensions_quota_service.h"
 #include "chrome/browser/extensions/external_provider_interface.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
@@ skipping 352 matching lines @@
   // permissions the given extension has been granted.
   bool ExtensionBindingsAllowed(const GURL& url);
 
   // Returns the icon to display in the omnibox for the given extension.
   gfx::Image GetOmniboxIcon(const std::string& extension_id);
 
   // Returns the icon to display in the omnibox popup window for the given
   // extension.
   gfx::Image GetOmniboxPopupIcon(const std::string& extension_id);
 
+  // Retrieves the page action, browser action, or script badge for |extension|.
+  // If the result is not NULL, it remains valid until the extension is
+  // unloaded.
+  ExtensionAction* GetPageAction(const extensions::Extension& extension) const;
+  ExtensionAction* GetBrowserAction(
+      const extensions::Extension& extension) const;
+  ExtensionAction* GetScriptBadge(const extensions::Extension& extension) const;
+
   // Called when the initial extensions load has completed.
   virtual void OnLoadedInstalledExtensions();
 
   // Adds |extension| to this ExtensionService and notifies observers than an
   // extension has been loaded.  Called by the backend after an extension has
   // been loaded from a file and installed.
   virtual void AddExtension(const extensions::Extension* extension) OVERRIDE;
 
   // Called by the backend when an extension has been installed.
   void OnExtensionInstalled(
@@ skipping 405 matching lines @@
   // Keeps track of app notifications.
   scoped_refptr<extensions::AppNotificationManager> app_notification_manager_;
 
   // Keeps track of favicon-sized omnibox icons for extensions.
   ExtensionIconManager omnibox_icon_manager_;
   ExtensionIconManager omnibox_popup_icon_manager_;
 
   // Flag to make sure event routers are only initialized once.
   bool event_routers_initialized_;
 
+  // Keyed by Extension ID.  These maps are populated when the extension is
+  // loaded, and the entries are removed when the extension is unloaded.  Not
+  // every extension has a page action or browser action, but all have a script
+  // badge.
+  std::map<std::string, ExtensionAction*> page_actions_;

[Jeffrey Yasskin, 2012/09/14 19:18:33]

These actually need to be stored in an ExtensionActionManager of some sort
instead of directly in the ExtensionService. I think it makes sense to put the
ExtensionActionManager in the ExtensionService instead of the ExtensionSystem,
but I'm not particularly clear on the difference between those classes.

(Repeated because I deleted the patch set that held this comment.)

[Aaron Boodman, 2012/09/16 01:42:50]

Per current design, it should be ExtensionSystem.

ExtensionService is an older class that was mostly about managing the list of
loaded extensions, but slowly grew to include lots of glue code integrating
extensions with many other subsystems.

The idea for ExtensionSystem was basically to be ExtensionService v2, but minus
all the glue. It just owns other parts of the extension system and maybe calls
Init().

It seems like maybe it isn't working out and we should reconsider it (again),
but that's the current intent anyway.

+  std::map<std::string, ExtensionAction*> browser_actions_;
+  std::map<std::string, ExtensionAction*> script_badges_;
+
   scoped_ptr<HistoryExtensionEventRouter> history_event_router_;
 
   scoped_ptr<extensions::BrowserEventRouter> browser_event_router_;
 
   scoped_ptr<extensions::WindowEventRouter> window_event_router_;
 
   scoped_ptr<ExtensionPreferenceEventRouter> preference_event_router_;
 
   scoped_ptr<BookmarkExtensionEventRouter> bookmark_event_router_;
 
@@ skipping 49 matching lines @@
 #endif
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsWithUnlimtedStorage);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsAndCheckStorageProtection);
   DISALLOW_COPY_AND_ASSIGN(ExtensionService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_