chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm - 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/cocoa/extensions/extension_action_context_menu.mm

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/app_list/extension_app_item.cc ('k') | chrome/browser/ui/extensions/application_launch.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/cocoa/extensions/extension_action_context_menu.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm

index f9ca1f826f51c2b7425e8706ba4283f8507020d0..8a0ae5a015f2cac0f2470e01c6302a30216e7627 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm

@@ -29,6 +29,7 @@

#include "chrome/common/chrome_notification_types.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/pref_names.h"

#include "chrome/common/url_constants.h"

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

@@ -204,7 +205,8 @@ enum {

break;

}

case kExtensionContextOptions: {

- DCHECK(!extension_->options_url().is_empty());

+ DCHECK(

+ !extensions::ManifestURLInfo::GetOptionsPage(extension_).is_empty());

extensions::ExtensionSystem::Get(browser_->profile())->process_manager()->

OpenOptionsPage(extension_, browser_);

break;

@@ -273,7 +275,8 @@ enum {

- (BOOL)validateMenuItem:(NSMenuItem*)menuItem {

if ([menuItem tag] == kExtensionContextOptions) {

// Disable 'Options' if there are no options to set.

- return extension_->options_url().spec().length() > 0;

+ return extensions::ManifestURLInfo::

+ GetOptionsPage(extension_).spec().length() > 0;

}

return YES;

}