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

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: replace missing extension_system include 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
« no previous file with comments | « chrome/browser/ui/app_list/apps_model_builder.cc ('k') | chrome/browser/ui/ash/app_sync_ui_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d0999e7e0eb4fc055c14d0fe7050adb538800685..dfa0fa98fd4e4665c177dc8b7da7c3e93370f780 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -65,7 +65,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;
@@ -78,7 +79,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_,
@@ -109,26 +111,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) {
@@ -152,8 +157,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;
}
@@ -171,7 +176,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.
« no previous file with comments | « chrome/browser/ui/app_list/apps_model_builder.cc ('k') | chrome/browser/ui/ash/app_sync_ui_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698