chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.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

« no previous file with comments | « no previous file | chrome/browser/extensions/api/developer_private/developer_private_api.cc » ('j') | chrome/browser/extensions/extension_process_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/automation/testing_automation_provider.cc

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc

index 012fb4922c3121bcfa754f7a63a1ea36ffb120fb..0db861f53d8e8cc3616b504ac3403873e3b8e18b 100644

--- a/chrome/browser/automation/testing_automation_provider.cc

+++ b/chrome/browser/automation/testing_automation_provider.cc

@@ -121,6 +121,7 @@

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

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

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

#include "chrome/common/extensions/permissions/permission_set.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/render_messages.h"

@@ -3725,7 +3726,7 @@ void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,

extension_value->SetString("background_url",

extension->GetBackgroundURL().spec());

extension_value->SetString("options_url",

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

+ extensions::ManifestURLInfo::GetOptionsPage(extension).spec());

extension_value->Set("host_permissions",

GetHostPermissions(extension, false));

extension_value->Set("effective_host_permissions",