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

chrome/browser/extensions/extension_context_menu_model.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/extensions/extension_context_menu_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 52 matching lines @@
 bool ExtensionContextMenuModel::IsCommandIdChecked(int command_id) const {
   return false;
 }
 
 bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const {
   const Extension* extension = this->GetExtension();
   if (!extension)
     return false;
 
   if (command_id == CONFIGURE) {
-    return extension->options_url().spec().length() > 0;
+    return
+        extensions::ManifestURL::GetOptionsPage(extension).spec().length() > 0;
   } else if (command_id == NAME) {
     // The NAME links to the Homepage URL. If the extension doesn't have a
     // homepage, we just disable this menu item.
     return extensions::ManifestURL::GetHomepageURL(extension).is_valid();
   } else if (command_id == INSPECT_POPUP) {
     WebContents* web_contents = chrome::GetActiveWebContents(browser_);
     if (!web_contents)
       return false;
 
     return extension_action_ &&
@@ skipping 18 matching lines @@
 
   switch (command_id) {
     case NAME: {
       OpenURLParams params(extensions::ManifestURL::GetHomepageURL(extension),
                            Referrer(), NEW_FOREGROUND_TAB,
                            content::PAGE_TRANSITION_LINK, false);
       browser_->OpenURL(params);
       break;
     }
     case CONFIGURE:
-      DCHECK(!extension->options_url().is_empty());
+      DCHECK(!extensions::ManifestURL::GetOptionsPage(extension).is_empty());
       extensions::ExtensionSystem::Get(profile_)->process_manager()->
           OpenOptionsPage(extension, browser_);
       break;
     case HIDE: {
       ExtensionService* extension_service =
           extensions::ExtensionSystem::Get(profile_)->extension_service();
       extension_service->extension_prefs()->
           SetBrowserActionVisibility(extension, false);
       break;
     }
@@ skipping 54 matching lines @@
     AddItemWithStringId(HIDE, IDS_EXTENSIONS_HIDE_BUTTON);
   AddSeparator(ui::NORMAL_SEPARATOR);
   AddItemWithStringId(MANAGE, IDS_MANAGE_EXTENSIONS);
 }
 
 const Extension* ExtensionContextMenuModel::GetExtension() const {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   return extension_service->GetExtensionById(extension_id_, false);
 }