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

Unified Diff: third_party/WebKit/Source/web/WebPluginContainerImpl.h

Issue 1426923007: Remove PluginLoadObserver and related logic, it was only used for NPAPI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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: third_party/WebKit/Source/web/WebPluginContainerImpl.h
diff --git a/third_party/WebKit/Source/web/WebPluginContainerImpl.h b/third_party/WebKit/Source/web/WebPluginContainerImpl.h
index dad54dbea510b74a6bf477de4479c2712a8e856e..21b6d3aaf4a4ef0f9831689c2f0abe35b56cf3aa 100644
--- a/third_party/WebKit/Source/web/WebPluginContainerImpl.h
+++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.h
@@ -55,7 +55,6 @@ class ResourceError;
class ResourceResponse;
class TouchEvent;
class WebPlugin;
-class WebPluginLoadObserver;
class WheelEvent;
class Widget;
struct WebPrintParams;
@@ -107,7 +106,7 @@ public:
NPObject* scriptableObjectForElement() override;
v8::Local<v8::Object> v8ObjectForElement() override;
WebString executeScriptURL(const WebURL&, bool popupsAllowed) override;
- void loadFrameRequest(const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData) override;
+ void loadFrameRequest(const WebURLRequest&, const WebString& target) override;
bool isRectTopmost(const WebRect&) override;
void requestTouchEventType(TouchEventRequestType) override;
void setWantsWheelEvents(bool) override;
@@ -155,10 +154,6 @@ public:
void didFinishLoading() override;
void didFailLoading(const ResourceError&) override;
-#if !ENABLE(OILPAN)
- void willDestroyPluginLoadObserver(WebPluginLoadObserver*);
-#endif
-
DECLARE_VIRTUAL_TRACE();
void dispose() override;
@@ -201,9 +196,6 @@ private:
RawPtrWillBeMember<HTMLPlugInElement> m_element;
WebPlugin* m_webPlugin;
-#if !ENABLE(OILPAN)
- Vector<WebPluginLoadObserver*> m_pluginLoadObservers;
-#endif
WebLayer* m_webLayer;

Powered by Google App Engine
This is Rietveld 408576698