chrome/browser/ui/extensions/application_launch.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/extensions/application_launch.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: Created 8 years 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

« chrome/browser/extensions/extension_process_manager.cc ('K') | « chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/extensions/application_launch.cc

diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc

index 4549ed2191cb11bed597009c63c8a45f650e04ec..d94fda1bd3e309cb042d7e8ca0980c1340c15bbd 100644

--- a/chrome/browser/ui/extensions/application_launch.cc

+++ b/chrome/browser/ui/extensions/application_launch.cc

@@ -21,6 +21,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_constants.h"

+#include "chrome/common/extensions/manifest_url_info.h"

#include "chrome/common/url_constants.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/web_contents.h"

@@ -57,7 +58,7 @@ GURL UrlForExtension(const Extension* extension,

// For extensions lacking launch urls, determine a reasonable fallback.

if (!url.is_valid()) {

- url = extension->options_url();

+ url = extensions::ManifestURLInfo::GetOptionsPage(extension);

if (!url.is_valid())

url = GURL(chrome::kChromeUIExtensionsURL);

}