Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6077)

Unified Diff: chrome/browser/extensions/api/context_menus/context_menus_api.cc

Issue 64953004: Split extensions::MenuManager instance out from ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Explicit nit Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/context_menu_matcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/context_menus/context_menus_api.cc
diff --git a/chrome/browser/extensions/api/context_menus/context_menus_api.cc b/chrome/browser/extensions/api/context_menus/context_menus_api.cc
index 3bd59af736eb3c4087183051ac316cfed7f1be69..1918e815960848c540ca4f7b2f4513c99250bb33 100644
--- a/chrome/browser/extensions/api/context_menus/context_menus_api.cc
+++ b/chrome/browser/extensions/api/context_menus/context_menus_api.cc
@@ -9,7 +9,6 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/values.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/menu_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/api/context_menus.h"
@@ -176,8 +175,7 @@ bool ContextMenusCreateFunction::RunImpl() {
if (params->create_properties.title.get())
title = *params->create_properties.title;
- MenuManager* menu_manager =
- GetProfile()->GetExtensionService()->menu_manager();
+ MenuManager* menu_manager = MenuManager::Get(GetProfile());
if (menu_manager->GetItemById(id)) {
error_ = ErrorUtils::FormatErrorMessage(kDuplicateIDError,
@@ -261,8 +259,7 @@ bool ContextMenusUpdateFunction::RunImpl() {
else
NOTREACHED();
- ExtensionService* service = GetProfile()->GetExtensionService();
- MenuManager* manager = service->menu_manager();
+ MenuManager* manager = MenuManager::Get(GetProfile());
MenuItem* item = manager->GetItemById(item_id);
if (!item || item->extension_id() != extension_id()) {
error_ = ErrorUtils::FormatErrorMessage(
@@ -357,8 +354,7 @@ bool ContextMenusRemoveFunction::RunImpl() {
scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
- ExtensionService* service = GetProfile()->GetExtensionService();
- MenuManager* manager = service->menu_manager();
+ MenuManager* manager = MenuManager::Get(GetProfile());
MenuItem::Id id(GetProfile()->IsOffTheRecord(), extension_id());
if (params->menu_item_id.as_string)
@@ -383,8 +379,7 @@ bool ContextMenusRemoveFunction::RunImpl() {
}
bool ContextMenusRemoveAllFunction::RunImpl() {
- ExtensionService* service = GetProfile()->GetExtensionService();
- MenuManager* manager = service->menu_manager();
+ MenuManager* manager = MenuManager::Get(GetProfile());
manager->RemoveAllContextItems(GetExtension()->id());
manager->WriteToStorage(GetExtension());
return true;
« no previous file with comments | « no previous file | chrome/browser/extensions/context_menu_matcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698