Commit 4b1146bc authored by ddorwin@chromium.org's avatar ddorwin@chromium.org

Add infrastructure to instantiate a helper plugin.

This is the Chromium side of http://webk.it/87399.

BUG=130425
TEST=None yet. Confirmed plugin is instantiated when GetClient()->createHelperPlugin(frame_); is added to WebMediaPlayerImpl::play().


Review URL: https://chromiumcodereview.appspot.com/10442102

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145924 0039d316-1c4b-4281-b951-d872f2087c98
parent e7d3acba
......@@ -116,6 +116,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebHelperPlugin.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
......@@ -1806,6 +1807,11 @@ bool RenderViewImpl::enumerateChosenDirectory(
webkit_glue::WebStringToFilePath(path)));
}
void RenderViewImpl::initializeHelperPluginWebFrame(
WebKit::WebHelperPlugin* plugin) {
plugin->initializeFrame(this);
}
void RenderViewImpl::didStartLoading() {
if (is_loading_) {
DVLOG(1) << "didStartLoading called while loading";
......
......@@ -437,6 +437,7 @@ class RenderViewImpl : public RenderWidget,
virtual bool enumerateChosenDirectory(
const WebKit::WebString& path,
WebKit::WebFileChooserCompletion* chooser_completion);
virtual void initializeHelperPluginWebFrame(WebKit::WebHelperPlugin*);
virtual void didStartLoading();
virtual void didStopLoading();
virtual void didChangeLoadProgress(WebKit::WebFrame* frame,
......
......@@ -23,6 +23,7 @@
#include "ipc/ipc_sync_message.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebHelperPlugin.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPagePopup.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h"
......@@ -157,6 +158,8 @@ WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) {
return WebPopupMenu::create(render_widget);
case WebKit::WebPopupTypePage:
return WebPagePopup::create(render_widget);
case WebKit::WebPopupTypeHelperPlugin:
return WebKit::WebHelperPlugin::create(render_widget);
default:
NOTREACHED();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment