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

Unified Diff: chrome/browser/extensions/api/tabs/ash_panel_contents.cc

Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 10 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/extensions/api/tabs/ash_panel_contents.cc
diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc
index cefc769e749dd31ac143d06df2548a76c4adf1b0..4279baa95359a823dc01ba3029ad042c7155c4a8 100644
--- a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc
+++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc
@@ -14,6 +14,8 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "content/public/browser/browser_context.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/app_window/native_app_window.h"
@@ -33,12 +35,15 @@ AshPanelContents::~AshPanelContents() {
}
void AshPanelContents::Initialize(content::BrowserContext* context,
+ content::RenderFrameHost* creator_frame,
const GURL& url) {
url_ = url;
- web_contents_.reset(
- content::WebContents::Create(content::WebContents::CreateParams(
- context, content::SiteInstance::CreateForURL(context, url_))));
+ content::WebContents::CreateParams create_params(
+ context, creator_frame->GetSiteInstance());
+ create_params.opener_render_process_id = creator_frame->GetProcess()->GetID();
+ create_params.opener_render_frame_id = creator_frame->GetRoutingID();
+ web_contents_.reset(content::WebContents::Create(create_params));
// Needed to give the web contents a Window ID. Extension APIs expect web
// contents to have a Window ID. Also required for FaviconDriver to correctly

Powered by Google App Engine
This is Rietveld 408576698