| Index: chrome/browser/extensions/extension_context_menu_model.cc
|
| diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
|
| index ce6b6e8823ee8ef5dcfd3275e43d77eb8b8d1947..eb333e9e48035dbd4a6f320f808d7f96737247e6 100644
|
| --- a/chrome/browser/extensions/extension_context_menu_model.cc
|
| +++ b/chrome/browser/extensions/extension_context_menu_model.cc
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/browser/ui/chrome_pages.h"
|
| +#include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -69,11 +70,12 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const {
|
| return false;
|
|
|
| if (command_id == CONFIGURE) {
|
| - return extension->options_url().spec().length() > 0;
|
| + return extensions::ExtensionURL::GetOptionsURL(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 extension->GetHomepageURL().is_valid();
|
| + return extensions::ExtensionURL::GetHomepageURL(extension).is_valid();
|
| } else if (command_id == INSPECT_POPUP) {
|
| WebContents* web_contents = chrome::GetActiveWebContents(browser_);
|
| if (!web_contents)
|
| @@ -101,14 +103,16 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id) {
|
|
|
| switch (command_id) {
|
| case NAME: {
|
| - OpenURLParams params(extension->GetHomepageURL(), Referrer(),
|
| - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK,
|
| + OpenURLParams params(extensions::ExtensionURL::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::ExtensionURL::GetOptionsURL(extension).is_empty());
|
| extensions::ExtensionSystem::Get(profile_)->process_manager()->
|
| OpenOptionsPage(extension, browser_);
|
| break;
|
|
|