| 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 43553ac2f5ee304f19f4b1217f377da35340a619..e475a55d7bbb84d57ca4b1fb85ce4033a218d61c 100644
|
| --- a/chrome/browser/guest_view/extension_options/extension_options_guest.cc
|
| +++ b/chrome/browser/guest_view/extension_options/extension_options_guest.cc
|
| @@ -6,8 +6,13 @@
|
|
|
| #include "base/values.h"
|
| #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
|
| +#include "chrome/browser/extensions/extension_tab_util.h"
|
| #include "chrome/browser/guest_view/extension_options/extension_options_constants.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/ui/browser.h"
|
| +#include "chrome/browser/ui/browser_finder.h"
|
| +#include "chrome/browser/ui/browser_window.h"
|
| +#include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/common/extensions/api/extension_options_internal.h"
|
| #include "chrome/common/extensions/manifest_url_handler.h"
|
| #include "components/crx_file/id_util.h"
|
| @@ -16,6 +21,7 @@
|
| #include "content/public/browser/web_contents.h"
|
| #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/extension.h"
|
| #include "extensions/common/extension_messages.h"
|
| #include "extensions/common/feature_switch.h"
|
| @@ -178,3 +184,29 @@ void ExtensionOptionsGuest::SetUpAutoSize() {
|
| SetAutoSize(
|
| true, gfx::Size(min_width, min_height), gfx::Size(max_width, max_height));
|
| }
|
| +
|
| +bool ExtensionOptionsGuest::ShouldCreateWebContents(
|
| + content::WebContents* web_contents,
|
| + int route_id,
|
| + WindowContainerType window_container_type,
|
| + const base::string16& frame_name,
|
| + const GURL& target_url,
|
| + const std::string& partition_id,
|
| + content::SessionStorageNamespace* session_storage_namespace) {
|
| + // This method handles opening links from within the guest. Since this guest
|
| + // view is used for displaying embedded extension options, we want any
|
| + // external links to be opened in a new tab, not in a new guest view.
|
| + // Therefore we just open the URL in a new tab, and since we aren't handling
|
| + // the new web contents, we return false.
|
| + Browser* browser =
|
| + chrome::FindBrowserWithWebContents(embedder_web_contents());
|
| + content::OpenURLParams params(target_url,
|
| + content::Referrer(),
|
| + NEW_FOREGROUND_TAB,
|
| + content::PAGE_TRANSITION_LINK,
|
| + false);
|
| + browser->OpenURL(params);
|
| + // TODO(ericzeng): Open the tab in the background if the click was a
|
| + // ctrl-click or middle mouse button click
|
| + return false;
|
| +}
|
|
|