Index: chrome/renderer/plugins/chrome_plugin_placeholder.cc |
diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.cc b/chrome/renderer/plugins/chrome_plugin_placeholder.cc |
index 13441a8eaac2077f79082a02c51811e3dbbf58a3..7b7506dcdbaf2404a30b8ca5ff4d629b87d39e91 100644 |
--- a/chrome/renderer/plugins/chrome_plugin_placeholder.cc |
+++ b/chrome/renderer/plugins/chrome_plugin_placeholder.cc |
@@ -27,14 +27,14 @@ |
using content::RenderThread; |
using content::RenderView; |
-using WebKit::WebDocument; |
-using WebKit::WebElement; |
-using WebKit::WebFrame; |
-using WebKit::WebMouseEvent; |
-using WebKit::WebNode; |
-using WebKit::WebPlugin; |
-using WebKit::WebPluginContainer; |
-using WebKit::WebPluginParams; |
+using blink::WebDocument; |
+using blink::WebElement; |
+using blink::WebFrame; |
+using blink::WebMouseEvent; |
+using blink::WebNode; |
+using blink::WebPlugin; |
+using blink::WebPluginContainer; |
+using blink::WebPluginParams; |
using webkit_glue::CppArgumentList; |
using webkit_glue::CppVariant; |
@@ -47,8 +47,8 @@ const char ChromePluginPlaceholder::kPluginPlaceholderDataURL[] = |
ChromePluginPlaceholder::ChromePluginPlaceholder( |
content::RenderView* render_view, |
- WebKit::WebFrame* frame, |
- const WebKit::WebPluginParams& params, |
+ blink::WebFrame* frame, |
+ const blink::WebPluginParams& params, |
const std::string& html_data, |
const string16& title) |
: plugins::PluginPlaceholder(render_view, |
@@ -352,7 +352,7 @@ void ChromePluginPlaceholder::ShowContextMenu(const WebMouseEvent& event) { |
g_last_active_menu = this; |
} |
-void ChromePluginPlaceholder::BindWebFrame(WebKit::WebFrame* frame) { |
+void ChromePluginPlaceholder::BindWebFrame(blink::WebFrame* frame) { |
plugins::PluginPlaceholder::BindWebFrame(frame); |
BindCallback("openAboutPlugins", |
base::Bind(&ChromePluginPlaceholder::OpenAboutPluginsCallback, |