Index: chrome/browser/ui/views/extensions/extension_action_view_controller.cc |
diff --git a/chrome/browser/ui/views/extensions/extension_action_view_controller.cc b/chrome/browser/ui/views/extensions/extension_action_view_controller.cc |
index 9256bd0b36e9279b8869b19bab76eacc64f30f97..23305920cb86ca636f18f9f6d3b464f8eaa14703 100644 |
--- a/chrome/browser/ui/views/extensions/extension_action_view_controller.cc |
+++ b/chrome/browser/ui/views/extensions/extension_action_view_controller.cc |
@@ -244,6 +244,11 @@ void ExtensionActionViewController::DoShowContextMenu( |
bool ExtensionActionViewController::ShowPopupWithUrl( |
ExtensionPopup::ShowAction show_action, const GURL& popup_url) { |
+ ExtensionActionViewController* preferred_controller = |
+ delegate_->GetPreferredPopupViewController(); |
+ if (preferred_controller != this) |
Peter Kasting
2014/09/11 20:23:12
Can we just make callers call this method on the c
Devlin
2014/09/11 20:53:42
I think that's actually more complicated overall.
Peter Kasting
2014/09/11 20:57:37
I'm only suggesting hoisting this to ExecuteAction
Devlin
2014/09/11 21:04:07
Ah, misunderstood. Yes, that's fine - done. (Onl
|
+ return preferred_controller->ShowPopupWithUrl(show_action, popup_url); |
+ |
// If we're already showing the popup for this browser action, just hide it |
// and return. |
bool already_showing = popup_ != NULL; |