Split extensions::MenuManager instance out from ExtensionService.

chrome/browser/extensions/context_menu_matcher.cc

 // 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.
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_util.h"
@@ skipping 117 matching lines @@
 bool ContextMenuMatcher::IsCommandIdEnabled(int command_id) const {
   MenuItem* item = GetExtensionMenuItem(command_id);
   if (!item)
     return true;
   return item->enabled();
 }
 
 void ContextMenuMatcher::ExecuteCommand(int command_id,
     content::WebContents* web_contents,
     const content::ContextMenuParams& params) {
-  MenuManager* manager = extensions::ExtensionSystem::Get(profile_)->
-      extension_service()->menu_manager();
   MenuItem* item = GetExtensionMenuItem(command_id);
   if (!item)
     return;
 
+  MenuManager* manager = MenuManager::Get(profile_);
   manager->ExecuteCommand(profile_, web_contents, params, item->id());
 }
 
 bool ContextMenuMatcher::GetRelevantExtensionTopLevelItems(
     const std::string& extension_id,
     const Extension** extension,
     bool* can_cross_incognito,
     MenuItem::List& items) {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
-  MenuManager* manager = service->menu_manager();
   *extension = service->GetExtensionById(extension_id, false);
 
   if (!*extension)
     return false;
 
   // Find matching items.
+  MenuManager* manager = MenuManager::Get(profile_);
   const MenuItem::List* all_items = manager->MenuItems(extension_id);
   if (!all_items || all_items->empty())
     return false;
 
   *can_cross_incognito = extension_util::CanCrossIncognito(*extension, service);
   items = GetRelevantExtensionItems(*all_items,
                                     *can_cross_incognito);
 
   return true;
 }
@@ skipping 69 matching lines @@
 
       menu_model->AddRadioItem(menu_id, title, radio_group_id);
     } else if (item->type() == MenuItem::SEPARATOR) {
       menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
     }
     last_type = item->type();
   }
 }
 
 MenuItem* ContextMenuMatcher::GetExtensionMenuItem(int id) const {
-  MenuManager* manager = extensions::ExtensionSystem::Get(profile_)->
-      extension_service()->menu_manager();
+  MenuManager* manager = MenuManager::Get(profile_);
   std::map<int, MenuItem::Id>::const_iterator i =
       extension_item_map_.find(id);
   if (i != extension_item_map_.end()) {
     MenuItem* item = manager->GetItemById(i->second);
     if (item)
       return item;
   }
   return NULL;
 }
 
 void ContextMenuMatcher::SetExtensionIcon(const std::string& extension_id) {
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(profile_)->extension_service();
-  MenuManager* menu_manager = service->menu_manager();
+  MenuManager* menu_manager = MenuManager::Get(profile_);
 
   int index = menu_model_->GetItemCount() - 1;
   DCHECK_GE(index, 0);
 
   const SkBitmap& icon = menu_manager->GetIconForExtension(extension_id);
   DCHECK(icon.width() == gfx::kFaviconSize);
   DCHECK(icon.height() == gfx::kFaviconSize);
 
   menu_model_->SetIcon(index, gfx::Image::CreateFrom1xBitmap(icon));
 }
 
 }  // namespace extensions