diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 02:47:52 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 02:47:52 +0000 |
| commit | a41dec94dcb81268cfb45be72ac6105e2ed686b7 (patch) | |
| tree | 1ae368d5fd66b526c566b091fbd90a6f2ef0c2d6 /chrome/renderer/plugins/chrome_plugin_placeholder.cc | |
| parent | 9508f239f64b85fa913df6f7518c231b6bf7e78c (diff) | |
| download | chromium_src-a41dec94dcb81268cfb45be72ac6105e2ed686b7.zip chromium_src-a41dec94dcb81268cfb45be72ac6105e2ed686b7.tar.gz chromium_src-a41dec94dcb81268cfb45be72ac6105e2ed686b7.tar.bz2 | |
Final (?) set of changes to unblock WebLocalFrame in blink.
Mostly mechanical like several other proceeding CLs. This is to unblock
https://codereview.chromium.org/232133004/ so it can land in Blink and
roll into Chrome.
BUG=346764
R=bauerb@chromium.org, jam@chromium.org, mkosiba@chromium.org
Review URL: https://codereview.chromium.org/234263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/plugins/chrome_plugin_placeholder.cc')
| -rw-r--r-- | chrome/renderer/plugins/chrome_plugin_placeholder.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.cc b/chrome/renderer/plugins/chrome_plugin_placeholder.cc index 53484f4..0d606aa 100644 --- a/chrome/renderer/plugins/chrome_plugin_placeholder.cc +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.cc @@ -20,9 +20,9 @@ #include "grit/renderer_resources.h" #include "grit/webkit_strings.h" #include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebScriptSource.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -32,6 +32,7 @@ using base::UserMetricsAction; using blink::WebDocument; using blink::WebElement; using blink::WebFrame; +using blink::WebLocalFrame; using blink::WebMouseEvent; using blink::WebNode; using blink::WebPlugin; @@ -49,7 +50,7 @@ const char ChromePluginPlaceholder::kPluginPlaceholderDataURL[] = ChromePluginPlaceholder::ChromePluginPlaceholder( content::RenderFrame* render_frame, - blink::WebFrame* frame, + blink::WebLocalFrame* frame, const blink::WebPluginParams& params, const std::string& html_data, const base::string16& title) @@ -87,7 +88,7 @@ ChromePluginPlaceholder::~ChromePluginPlaceholder() { // static ChromePluginPlaceholder* ChromePluginPlaceholder::CreateMissingPlugin( content::RenderFrame* render_frame, - WebFrame* frame, + WebLocalFrame* frame, const WebPluginParams& params) { const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( @@ -142,7 +143,7 @@ ChromePluginPlaceholder* ChromePluginPlaceholder::CreateErrorPlugin( // static ChromePluginPlaceholder* ChromePluginPlaceholder::CreateBlockedPlugin( content::RenderFrame* render_frame, - WebFrame* frame, + WebLocalFrame* frame, const WebPluginParams& params, const content::WebPluginInfo& plugin, const std::string& identifier, |