chrome/browser/extensions/api/management/management_api.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/extensions/api/management/management_api.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/extensions/api/developer_private/developer_private_api.cc ('k') | chrome/browser/extensions/extension_context_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/management/management_api.cc

diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc

index f0b3635843f862591a99e6eac8bdd18e84007a8a..af08b1451f6f4a0d61b9d978031ead7f05b45a1e 100644

--- a/chrome/browser/extensions/api/management/management_api.cc

+++ b/chrome/browser/extensions/api/management/management_api.cc

@@ -95,7 +95,8 @@ scoped_ptr<management::ExtensionInfo> CreateExtensionInfo(

info->offline_enabled = extension.offline_enabled();

info->version = extension.VersionString();

info->description = extension.description();

- info->options_url = extension.options_url().spec();

+ info->options_url =

+ extensions::ManifestURL::GetOptionsPage(&extension).spec();

info->homepage_url.reset(new std::string(

extensions::ManifestURL::GetHomepageURL(&extension).spec()));

info->may_disable = system->management_policy()->

@@ -127,9 +128,9 @@ scoped_ptr<management::ExtensionInfo> CreateExtensionInfo(

}

- if (!extension.update_url().is_empty()) {

+ if (!extensions::ManifestURL::GetUpdateURL(&extension).is_empty()) {

info->update_url.reset(new std::string(

- extension.update_url().spec()));

+ extensions::ManifestURL::GetUpdateURL(&extension).spec()));

}

if (extension.is_app()) {