diff options
| author | gpdavis.chromium@gmail.com <gpdavis.chromium@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 20:01:12 +0000 |
|---|---|---|
| committer | gpdavis.chromium@gmail.com <gpdavis.chromium@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 20:02:37 +0000 |
| commit | 99122f042f54d56e952c4200f42f29768474bf7b (patch) | |
| tree | 5da6d89e301419d6d663867f24826a400ed0ef01 /chrome/browser/extensions/menu_manager_factory.cc | |
| parent | bd000a6532d8ea9e02ce701bf55ef08f5a4ea054 (diff) | |
| download | chromium_src-99122f042f54d56e952c4200f42f29768474bf7b.zip chromium_src-99122f042f54d56e952c4200f42f29768474bf7b.tar.gz chromium_src-99122f042f54d56e952c4200f42f29768474bf7b.tar.bz2 | |
Extend contextMenus API to support browser/page actions
Screenshot:
http://i.imgur.com/RILqQqe.png
BUG=234425
Review URL: https://codereview.chromium.org/359493005
Cr-Commit-Position: refs/heads/master@{#288418}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/menu_manager_factory.cc')
| -rw-r--r-- | chrome/browser/extensions/menu_manager_factory.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/extensions/menu_manager_factory.cc b/chrome/browser/extensions/menu_manager_factory.cc index 60fa844..33c3f74 100644 --- a/chrome/browser/extensions/menu_manager_factory.cc +++ b/chrome/browser/extensions/menu_manager_factory.cc @@ -25,6 +25,12 @@ MenuManagerFactory* MenuManagerFactory::GetInstance() { return Singleton<MenuManagerFactory>::get(); } +// static +KeyedService* MenuManagerFactory::BuildServiceInstanceForTesting( + content::BrowserContext* context) { + return GetInstance()->BuildServiceInstanceFor(context); +} + MenuManagerFactory::MenuManagerFactory() : BrowserContextKeyedServiceFactory( "MenuManager", @@ -37,9 +43,7 @@ MenuManagerFactory::~MenuManagerFactory() {} KeyedService* MenuManagerFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); - return new MenuManager( - profile, - ExtensionSystem::Get(profile)->state_store()); + return new MenuManager(profile, ExtensionSystem::Get(profile)->state_store()); } content::BrowserContext* MenuManagerFactory::GetBrowserContextToUse( |