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

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

Issue 2165523004: Force MimeHandlerView to always use BrowserPlugin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Two quick fixes (One outstanding from lfg@'s comments) Created 4 years, 3 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.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index ccfb0b990d3b2ee748ae053495a6f266f796ef71..242e231bdabf49934c7191feb51ec113241d0957 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -33,6 +33,7 @@
#include "content/common/input/input_event_ack_state.h"
#include "content/public/browser/browser_plugin_guest_delegate.h"
#include "content/public/browser/guest_host.h"
+#include "content/public/browser/guest_mode.h"
#include "content/public/browser/readback_types.h"
#include "content/public/browser/web_contents_observer.h"
#include "third_party/WebKit/public/platform/WebDragOperation.h"
@@ -253,6 +254,11 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
void ResendEventToEmbedder(const blink::WebInputEvent& event);
+ // TODO(ekaramad): Remove this once https://crbug.com/642826 is resovled.
Charlie Reis 2016/09/07 00:22:29 nit: resolved
EhsanK 2016/09/08 18:14:57 Done.
+ bool is_mime_handler_view_guest() const {
Charlie Reis 2016/09/07 00:22:29 Content/ doesn't know about MIMEHandlerView, so it
EhsanK 2016/09/08 18:14:57 Good idea! How about CanUseCrossProcessFrames() fo
Charlie Reis 2016/09/15 20:56:10 That sounds better, thanks.
+ return is_mime_handler_view_guest_;
+ }
+
protected:
// BrowserPluginGuest is a WebContentsObserver of |web_contents| and
@@ -446,6 +452,10 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
BrowserPluginGuestDelegate* const delegate_;
+ // Whether or not this BrowserPluginGuest corresponds to a guest of tyoe
+ // MimeHandlerView.
+ bool is_mime_handler_view_guest_;
+
// Weak pointer used to ask GeolocationPermissionContext about geolocation
// permission.
base::WeakPtrFactory<BrowserPluginGuest> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698