Index: chrome/browser/guest_view/extension_options/extension_options_guest.cc |
diff --git a/chrome/browser/guest_view/extension_options/extension_options_guest.cc b/chrome/browser/guest_view/extension_options/extension_options_guest.cc |
index 117f562d8bdb58388a8e6559f8331f2fb9f1a899..f22f3dd359bb3a56b09a2535e4f8a1fe7632e4d9 100644 |
--- a/chrome/browser/guest_view/extension_options/extension_options_guest.cc |
+++ b/chrome/browser/guest_view/extension_options/extension_options_guest.cc |
@@ -24,6 +24,7 @@ |
#include "extensions/browser/extension_function_dispatcher.h" |
#include "extensions/browser/extension_registry.h" |
#include "extensions/browser/guest_view/guest_view_manager.h" |
+#include "extensions/common/constants.h" |
#include "extensions/common/extension.h" |
#include "extensions/common/extension_messages.h" |
#include "extensions/common/feature_switch.h" |
@@ -155,6 +156,26 @@ content::WebContents* ExtensionOptionsGuest::GetAssociatedWebContents() const { |
return web_contents(); |
} |
+content::WebContents* ExtensionOptionsGuest::OpenURLFromTab( |
+ content::WebContents* source, |
+ const content::OpenURLParams& params) { |
+ Browser* browser = |
+ chrome::FindBrowserWithWebContents(embedder_web_contents()); |
+ |
+ if ((!params.url.SchemeIs(extensions::kExtensionScheme) || |
Fady Samuel
2014/09/05 21:11:57
Some comments describing what you're doing would b
ericzeng
2014/09/05 21:17:19
Done.
|
+ params.url.host() != options_page_.host()) && |
+ params.disposition == CURRENT_TAB) { |
Fady Samuel
2014/09/05 21:11:57
Early exit preferred for readability.
ericzeng
2014/09/05 21:17:19
How do I early exit for this condition? Wouldn't f
Fady Samuel
2014/09/05 21:18:01
You're probably right...lgtm
|
+ return browser->OpenURL( |
+ content::OpenURLParams(params.url, |
+ params.referrer, |
+ params.frame_tree_node_id, |
+ NEW_FOREGROUND_TAB, |
+ params.transition, |
+ params.is_renderer_initiated)); |
+ } |
+ return browser->OpenURL(params); |
+} |
+ |
void ExtensionOptionsGuest::CloseContents(content::WebContents* source) { |
DispatchEventToEmbedder(new extensions::GuestViewBase::Event( |
extension_options_internal::OnClose::kEventName, |