| Index: chrome/renderer/plugins/plugin_placeholder.h
|
| diff --git a/chrome/renderer/plugins/plugin_placeholder.h b/chrome/renderer/plugins/plugin_placeholder.h
|
| index 7ec95bae6b1786330404ae10af3c32a93196e731..d189ae2e36a005eccaa1faff93b9f22bce2df630 100644
|
| --- a/chrome/renderer/plugins/plugin_placeholder.h
|
| +++ b/chrome/renderer/plugins/plugin_placeholder.h
|
| @@ -10,8 +10,8 @@
|
| #include "content/public/renderer/context_menu_client.h"
|
| #include "content/public/renderer/render_process_observer.h"
|
| #include "content/public/renderer/render_view_observer.h"
|
| +#include "content/renderer/cpp_bound_class.h"
|
| #include "third_party/WebKit/public/web/WebPluginParams.h"
|
| -#include "webkit/renderer/cpp_bound_class.h"
|
|
|
| struct ChromeViewHostMsg_GetPluginInfo_Status;
|
|
|
| @@ -23,7 +23,7 @@ struct WebPluginInfo;
|
| // (blocked or disabled).
|
| class PluginPlaceholder : public content::RenderViewObserver,
|
| public content::RenderProcessObserver,
|
| - public webkit_glue::CppBoundClass,
|
| + public content::CppBoundClass,
|
| public WebViewPlugin::Delegate,
|
| public content::ContextMenuClient {
|
| public:
|
| @@ -117,21 +117,21 @@ class PluginPlaceholder : public content::RenderViewObserver,
|
| // Javascript callbacks:
|
| // Load the blocked plugin by calling LoadPlugin().
|
| // Takes no arguments, and returns nothing.
|
| - void LoadCallback(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void LoadCallback(const content::CppArgumentList& args,
|
| + content::CppVariant* result);
|
|
|
| // Hide the blocked plugin by calling HidePlugin().
|
| // Takes no arguments, and returns nothing.
|
| - void HideCallback(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void HideCallback(const content::CppArgumentList& args,
|
| + content::CppVariant* result);
|
|
|
| // Opens chrome://plugins in a new tab.
|
| // Takes no arguments, and returns nothing.
|
| - void OpenAboutPluginsCallback(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void OpenAboutPluginsCallback(const content::CppArgumentList& args,
|
| + content::CppVariant* result);
|
|
|
| - void DidFinishLoadingCallback(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void DidFinishLoadingCallback(const content::CppArgumentList& args,
|
| + content::CppVariant* result);
|
|
|
| void OnLoadBlockedPlugins(const std::string& identifier);
|
| void OnSetIsPrerendering(bool is_prerendering);
|
| @@ -149,8 +149,8 @@ class PluginPlaceholder : public content::RenderViewObserver,
|
| static bool IsValidYouTubeVideo(const std::string& path);
|
|
|
| // Opens a youtube app in the current tab.
|
| - void OpenYoutubeUrlCallback(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void OpenYoutubeUrlCallback(const content::CppArgumentList& args,
|
| + content::CppVariant* result);
|
| #endif
|
|
|
| void SetMessage(const string16& message);
|
|
|