chrome/browser/ui/app_list/extension_app_item.cc - Issue 11726002: Move the parsing of 'update_url' & 'options_page' URLs out of Extension.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/app_list/extension_app_item.cc

Issue 11726002: Move the parsing of 'update_url' & 'options_page' URLs out of Extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@url_parse

Patch Set: fixed HomepageURLManifestTest.GetHomepageURL Created 7 years, 11 months 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/themes/theme_syncable_service_unittest.cc ('k') | chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 c41628eea2d40f20394f56992f37ee83fc254201..b5e9a31fe8bd4934507e6b606ade013722b830b5 100644

--- a/chrome/browser/ui/app_list/extension_app_item.cc

+++ b/chrome/browser/ui/app_list/extension_app_item.cc

@@ -26,6 +26,7 @@

#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_handler.h"

#include "content/public/common/context_menu_params.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

@@ -304,9 +305,10 @@ void ExtensionAppItem::ShowExtensionOptions() {

if (!extension)

return;

- chrome::NavigateParams params(profile_,

- extension->options_url(),

- content::PAGE_TRANSITION_LINK);

+ chrome::NavigateParams params(

+ profile_,

+ extensions::ManifestURL::GetOptionsPage(extension),

+ content::PAGE_TRANSITION_LINK);

chrome::Navigate(&params);

}

@@ -425,7 +427,7 @@ bool ExtensionAppItem::IsCommandIdEnabled(int command_id) const {

} else if (command_id == OPTIONS) {

const Extension* extension = GetExtension();

return IsExtensionEnabled(profile_, extension_id_) && extension &&

- !extension->options_url().is_empty();

+ !extensions::ManifestURL::GetOptionsPage(extension).is_empty();

} else if (command_id == UNINSTALL) {

const Extension* extension = GetExtension();

const extensions::ManagementPolicy* policy =