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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 264943006: BrowserPlugin: Simplify content/public API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@guestview_manager_v1
Patch Set: Fixed nit Created 6 years, 7 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: content/browser/browser_plugin/browser_plugin_guest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index eddc9258bfaddd0b9b3737e6d7ea21f671e6d720..6f6d9755bec437f9663403e30e95eaed49f08a1d 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -98,8 +98,20 @@ class BrowserPluginGuest::NewWindowRequest : public PermissionRequest {
const std::string& user_input) OVERRIDE {
int embedder_render_process_id =
guest_->embedder_web_contents()->GetRenderProcessHost()->GetID();
- BrowserPluginGuest* guest = guest_->GetBrowserPluginGuestManager()->
- GetGuestByInstanceID(instance_id_, embedder_render_process_id);
+ guest_->GetBrowserPluginGuestManager()->
+ MaybeGetGuestByInstanceIDOrKill(
+ instance_id_,
+ embedder_render_process_id,
+ base::Bind(&BrowserPluginGuest::NewWindowRequest::RespondInternal,
+ base::Unretained(this),
+ should_allow));
+ }
+
+ private:
+ virtual ~NewWindowRequest() {}
+
+ void RespondInternal(bool should_allow,
+ BrowserPluginGuest* guest) {
if (!guest) {
VLOG(0) << "Guest not found. Instance ID: " << instance_id_;
return;
@@ -110,8 +122,6 @@ class BrowserPluginGuest::NewWindowRequest : public PermissionRequest {
guest->Destroy();
}
- private:
- virtual ~NewWindowRequest() {}
int instance_id_;
};

Powered by Google App Engine
This is Rietveld 408576698