Move the parsing of 'update_url' & 'options_page' URLs out of Extension.

chrome/browser/ui/app_list/extension_app_item.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 "chrome/browser/ui/app_list/extension_app_item.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
+#include "chrome/common/extensions/manifest_url_info.h"
 #include "content/public/common/context_menu_params.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 
 using extensions::Extension;
@@ skipping 224 matching lines @@
       0, 0);
   icon_canvas.DrawImageInt(icon, kIconOffset, kIconOffset + kVerticalAdjust);
   SetIcon(gfx::ImageSkia(icon_canvas.ExtractImageRep()));
 }
 
 void ExtensionAppItem::ShowExtensionOptions() {
   const Extension* extension = GetExtension();
   if (!extension)
     return;
 
-  chrome::NavigateParams params(profile_,
-                                extension->options_url(),
-                                content::PAGE_TRANSITION_LINK);
+  chrome::NavigateParams params(
+      profile_,
+      extensions::ManifestURLInfo::GetOptionsPage(extension),
+      content::PAGE_TRANSITION_LINK);
   chrome::Navigate(&params);
 }
 
 void ExtensionAppItem::ShowExtensionDetails() {
   const Extension* extension = GetExtension();
   if (!extension)
     return;
 
   chrome::NavigateParams params(profile_,
                                 extension->details_url(),
@@ skipping 47 matching lines @@
   }
   return false;
 }
 
 bool ExtensionAppItem::IsCommandIdEnabled(int command_id) const {
   if (command_id == TOGGLE_PIN) {
     return controller_->CanPin();
   } else if (command_id == OPTIONS) {
     const Extension* extension = GetExtension();
     return IsExtensionEnabled(profile_, extension_id_) && extension &&
-        !extension->options_url().is_empty();
+        !extensions::ManifestURLInfo::GetOptionsPage(extension).is_empty();
   } else if (command_id == UNINSTALL) {
     const Extension* extension = GetExtension();
     const extensions::ManagementPolicy* policy =
         extensions::ExtensionSystem::Get(profile_)->management_policy();
     return extension &&
            policy->UserMayModifySettings(extension, NULL);
   } else if (command_id == DETAILS) {
     const Extension* extension = GetExtension();
     return extension && extension->from_webstore();
   } else if (command_id >= IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST &&
@@ skipping 145 matching lines @@
     }
 
     context_menu_model_->AddItemWithStringId(UNINSTALL,
                                              extension->is_platform_app() ?
                                                  IDS_APP_LIST_UNINSTALL_ITEM :
                                                  IDS_EXTENSIONS_UNINSTALL);
   }
 
   return context_menu_model_.get();
 }