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

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

Issue 2700613003: Enable find-in-page across GuestViews. (Closed)
Patch Set: Small fix. Created 3 years, 8 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
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.h ('k') | content/browser/find_request_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 626114c3ed192028263ab9b2dc23139eb173383a..fb2a93154f443a9b6fe0326eb9b3e8cc6ab68d65 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -148,6 +148,8 @@ int BrowserPluginGuest::GetGuestProxyRoutingID() {
// create a RenderFrameProxyHost for the reverse path, or implement
// MimeHandlerViewGuest using OOPIF (https://crbug.com/659750).
SiteInstance* owner_site_instance = delegate_->GetOwnerSiteInstance();
+ if (!owner_site_instance)
+ return MSG_ROUTING_NONE;
int proxy_routing_id = GetWebContents()
->GetFrameTree()
->root()
@@ -179,8 +181,13 @@ void BrowserPluginGuest::SizeContents(const gfx::Size& new_size) {
void BrowserPluginGuest::WillDestroy() {
is_in_destruction_ = true;
- owner_web_contents_ = nullptr;
+
+ // It is important that the WebContents is notified of destruction before
+ // detaching.
+ GetWebContents()->BrowserPluginGuestWillDestroy();
+
attached_ = false;
+ owner_web_contents_ = nullptr;
}
RenderWidgetHostImpl* BrowserPluginGuest::GetOwnerRenderWidgetHost() const {
@@ -432,17 +439,6 @@ void BrowserPluginGuest::OnRequireSequence(
GetSurfaceManager()->RequireSequence(id, sequence);
}
-bool BrowserPluginGuest::HandleFindForEmbedder(
- int request_id,
- const base::string16& search_text,
- const blink::WebFindOptions& options) {
- return delegate_->HandleFindForEmbedder(request_id, search_text, options);
-}
-
-bool BrowserPluginGuest::HandleStopFindingForEmbedder(StopFindAction action) {
- return delegate_->HandleStopFindingForEmbedder(action);
-}
-
void BrowserPluginGuest::ResendEventToEmbedder(
const blink::WebInputEvent& event) {
if (!attached() || !owner_web_contents_)
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.h ('k') | content/browser/find_request_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698