extensions/browser/guest_view/app_view/app_view_guest.cc - Issue 444813002: Remove BrowserPlugin's -internal-attach method

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/guest_view/app_view/app_view_guest.cc

Issue 444813002: Remove BrowserPlugin's -internal-attach method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Don't crash on tear down 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:

Index: extensions/browser/guest_view/app_view/app_view_guest.cc

diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc

index 45ef219915d0a55b1e4f4bc99889c03673e944eb..9b82badfe1508ed2d3819d1a650d5e013db5ffe5 100644

--- a/extensions/browser/guest_view/app_view/app_view_guest.cc

+++ b/extensions/browser/guest_view/app_view/app_view_guest.cc

@@ -168,7 +168,7 @@ void AppViewGuest::CreateWebContents(

}

pending_response_map.Get().insert(

- std::make_pair(GetGuestInstanceID(),

+ std::make_pair(guest_instance_id(),

make_linked_ptr(new ResponseInfo(

guest_extension,

weak_ptr_factory_.GetWeakPtr(),

@@ -247,7 +247,7 @@ void AppViewGuest::LaunchAppAndFireEvent(

}

scoped_ptr<base::DictionaryValue> embed_request(new base::DictionaryValue());

- embed_request->SetInteger(appview::kGuestInstanceID, GetGuestInstanceID());

+ embed_request->SetInteger(appview::kGuestInstanceID, guest_instance_id());

embed_request->SetString(appview::kEmbedderID, embedder_extension_id());

embed_request->Set(appview::kData, data.release());

AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent(