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

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

Issue 2808923003: Revert of Enable find-in-page across GuestViews. (Closed)
Patch Set: Fixed patch conflicts. 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 bdaa407ccc61d0f09881494d5aa7b45ea7c288c6..e6baddc7d35f1ff5d1b0efcf65ba65ddca6405d2 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -147,8 +147,6 @@ 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()
@@ -180,13 +178,8 @@ void BrowserPluginGuest::SizeContents(const gfx::Size& new_size) {
void BrowserPluginGuest::WillDestroy() {
is_in_destruction_ = true;
-
- // It is important that the WebContents is notified of destruction before
- // detaching.
- GetWebContents()->BrowserPluginGuestWillDestroy();
-
- attached_ = false;
owner_web_contents_ = nullptr;
+ attached_ = false;
}
RenderWidgetHostImpl* BrowserPluginGuest::GetOwnerRenderWidgetHost() const {
@@ -437,6 +430,17 @@ 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