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

Unified Diff: chrome/browser/extensions/extension_context_menu_model.cc

Issue 484033003: Open embedded extension options from the extension action context menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix some bugs Created 6 years, 4 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 | « no previous file | chrome/browser/resources/extensions/extension_list.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_context_menu_model.cc
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index 7230b9ed6345012af57ddde9560c031f74517df6..1b5f2d96c60e38679970abf134c856cf57b1f05a 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -33,6 +33,7 @@
#include "extensions/browser/management_policy.h"
#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/extension.h"
+#include "extensions/common/feature_switch.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -175,7 +176,10 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id,
}
case CONFIGURE:
DCHECK(!extensions::ManifestURL::GetOptionsPage(extension).is_empty());
- extensions::ExtensionTabUtil::OpenOptionsPage(extension, browser_);
+ if (extensions::FeatureSwitch::embedded_extension_options()->IsEnabled())
+ chrome::ShowExtensionOptions(browser_, extension->id());
Devlin 2014/08/19 17:39:07 will look at this more later, but first off, why n
ericzeng 2014/08/19 18:25:39 That's a good idea; I just did it this way because
+ else
+ extensions::ExtensionTabUtil::OpenOptionsPage(extension, browser_);
break;
case HIDE: {
extensions::ExtensionActionAPI::SetBrowserActionVisibility(
« no previous file with comments | « no previous file | chrome/browser/resources/extensions/extension_list.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698