Tweak IsExtensionEnabled and consolidate callers of related functions

BUG=none
TEST=ExtensionService*, ExtensionPrefs*

Review URL: http://codereview.chromium.org/7330029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92047 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 8 deletions

diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc
index 8cfb746..bce7b9c 100644
--- a/chrome/browser/notifications/notification_options_menu_model.cc
+++ b/chrome/browser/notifications/notification_options_menu_model.cc
@@ -168,12 +168,10 @@ string16 NotificationOptionsMenuModel::GetLabelForCommandId(int command_id)
           balloon_->profile()->GetExtensionService();
       const Extension* extension = ext_service->GetExtensionByURL(origin);
       if (extension) {
-        ExtensionPrefs* extension_prefs = ext_service->extension_prefs();
-        const std::string& id = extension->id();
-        if (extension_prefs->GetExtensionState(id) == Extension::ENABLED)
-          return l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE);
-        else
-          return l10n_util::GetStringUTF16(IDS_EXTENSIONS_ENABLE);
+        return l10n_util::GetStringUTF16(
+            ext_service->IsExtensionEnabled(extension->id()) ?
+                IDS_EXTENSIONS_DISABLE :
+                IDS_EXTENSIONS_ENABLE);
       }
     } else {
       if (service->GetContentSetting(origin) == CONTENT_SETTING_ALLOW) {
@@ -226,9 +224,8 @@ void NotificationOptionsMenuModel::ExecuteCommand(int command_id) {
     case kToggleExtensionCommand: {
       const Extension* extension = ext_service->GetExtensionByURL(origin);
       if (extension) {
-        ExtensionPrefs* extension_prefs = ext_service->extension_prefs();
         const std::string& id = extension->id();
-        if (extension_prefs->GetExtensionState(id) == Extension::ENABLED)
+        if (ext_service->IsExtensionEnabled(id))
           ext_service->DisableExtension(id);
         else
           ext_service->EnableExtension(id);