chrome/browser/ui/app_list/extension_app_item.cc - Issue 11742005: Move [Homepage,Options,Update,DevTools]URL 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 11742005: Move [Homepage,Options,Update,DevTools]URL out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action

Patch Set: Created 7 years, 12 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 817fdad8364587752ca78a5f52a79980d9dc556d..b2fdc4b59c114b16153c97b3b1b693fab986e7c3 100644

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

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

@@ -20,6 +20,7 @@

#include "chrome/browser/ui/browser_navigator.h"

#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/browser_window.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/extensions/extension_icon_set.h"

@@ -268,7 +269,7 @@ void ExtensionAppItem::ShowExtensionOptions() {

return;

chrome::NavigateParams params(profile_,

- extension->options_url(),

+ ExtensionURL::GetOptionsURL(extension),

content::PAGE_TRANSITION_LINK);

chrome::Navigate(&params);

}

@@ -337,7 +338,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();

+ !ExtensionURL::GetOptionsURL(extension).is_empty();

} else if (command_id == UNINSTALL) {

const Extension* extension = GetExtension();

const extensions::ManagementPolicy* policy =