Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1121)

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm

Issue 518653002: Add the "options_ui" extension manifest field. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build issue? Created 6 years, 3 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
Index: chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm
index cbf79326c1a80ada265080d3b35c6e4fcb5b2a6d..0efcb9d4be6f703d6089d2f26743a9ee7d92266b 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm
@@ -32,6 +32,7 @@
#include "extensions/browser/extension_system.h"
#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/extension.h"
+#include "extensions/common/manifest_handlers/options_page_info.h"
#include "ui/base/l10n/l10n_util_mac.h"
using content::OpenURLParams;
@@ -134,7 +135,7 @@ class AsyncUninstaller : public extensions::ExtensionUninstallDialog::Delegate {
action:@selector(onOptions:)
keyEquivalent:@""];
[item setTarget:self];
- [item setEnabled:extensions::ManifestURL::GetOptionsPage(
+ [item setEnabled:extensions::OptionsPageInfo::GetOptionsPage(
extension_).spec().length() > 0];
@@ -198,7 +199,7 @@ class AsyncUninstaller : public extensions::ExtensionUninstallDialog::Delegate {
}
- (void)onOptions:(id)sender {
- DCHECK(!extensions::ManifestURL::GetOptionsPage(extension_).is_empty());
+ DCHECK(!extensions::OptionsPageInfo::GetOptionsPage(extension_).is_empty());
extensions::ExtensionTabUtil::OpenOptionsPage(extension_, browser_);
}
« no previous file with comments | « chrome/browser/ui/app_list/app_list_controller_delegate.cc ('k') | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698