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

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

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
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..fb5338e98f079d34e262b5614290a5090edf5ed3 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
@@ -27,6 +27,7 @@
#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
#include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
#include "chrome/common/chrome_notification_types.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/pref_names.h"
@@ -204,7 +205,7 @@ enum {
break;
}
case kExtensionContextOptions: {
- DCHECK(!extension_->options_url().is_empty());
+ DCHECK(!ExtensionURL::GetOptionsURL(extension_).is_empty());
extensions::ExtensionSystem::Get(browser_->profile())->process_manager()->
OpenOptionsPage(extension_, browser_);
break;
@@ -273,7 +274,7 @@ 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 ExtensionURL::GetOptionsURL(extension_).spec().length() > 0;
}
return YES;
}
« no previous file with comments | « chrome/browser/ui/app_list/extension_app_item.cc ('k') | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698