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

Unified Diff: chrome/browser/ui/app_list/extension_app_item.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: response to sky Created 8 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
Index: chrome/browser/ui/app_list/extension_app_item.cc
diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc
index f4bed55561459e8105daf0f6884df90256948b09..36b48b2b0fcd7d4dbe2d12be4cfde06a1d4503c3 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -63,7 +63,8 @@ class ExtensionUninstaller : public ExtensionUninstallDialog::Delegate {
void Run() {
const Extension* extension =
- profile_->GetExtensionService()->GetExtensionById(extension_id_, true);
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ GetExtensionById(extension_id_, true);
if (!extension) {
CleanUp();
return;
@@ -77,7 +78,8 @@ class ExtensionUninstaller : public ExtensionUninstallDialog::Delegate {
private:
// Overridden from ExtensionUninstallDialog::Delegate:
virtual void ExtensionUninstallAccepted() OVERRIDE {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
const Extension* extension = service->GetExtensionById(extension_id_, true);
if (extension) {
service->UninstallExtension(extension_id_,
@@ -105,26 +107,29 @@ class ExtensionUninstaller : public ExtensionUninstallDialog::Delegate {
extensions::ExtensionPrefs::LaunchType GetExtensionLaunchType(
Profile* profile,
const Extension* extension) {
- return profile->GetExtensionService()->extension_prefs()->GetLaunchType(
- extension, extensions::ExtensionPrefs::LAUNCH_DEFAULT);
+ return extensions::ExtensionSystem::Get(profile)->extension_service()->
+ extension_prefs()->GetLaunchType(extension,
+ extensions::ExtensionPrefs::LAUNCH_DEFAULT);
}
void SetExtensionLaunchType(
Profile* profile,
const std::string& extension_id,
extensions::ExtensionPrefs::LaunchType launch_type) {
- profile->GetExtensionService()->extension_prefs()->SetLaunchType(
- extension_id, launch_type);
+ extensions::ExtensionSystem::Get(profile)->extension_service()->
+ extension_prefs()->SetLaunchType(extension_id, launch_type);
}
bool IsExtensionEnabled(Profile* profile, const std::string& extension_id) {
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
return service->IsExtensionEnabled(extension_id) &&
!service->GetTerminatedExtension(extension_id);
}
ExtensionSorting* GetExtensionSorting(Profile* profile) {
- return profile->GetExtensionService()->extension_prefs()->extension_sorting();
+ return extensions::ExtensionSystem::Get(profile)->extension_service()->
+ extension_prefs()->extension_sorting();
}
bool MenuItemHasLauncherContext(const extensions::MenuItem* item) {
@@ -148,8 +153,8 @@ ExtensionAppItem::~ExtensionAppItem() {
}
const Extension* ExtensionAppItem::GetExtension() const {
- const Extension* extension =
- profile_->GetExtensionService()->GetInstalledExtension(extension_id_);
+ const Extension* extension = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->GetInstalledExtension(extension_id_);
return extension;
}
@@ -167,7 +172,8 @@ void ExtensionAppItem::Move(const ExtensionAppItem* prev,
if (!prev && !next)
return;
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
service->extension_prefs()->SetAppDraggedByUser(extension_id_);
// Handles only predecessor or only successor case.

Powered by Google App Engine
This is Rietveld 408576698