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

Unified Diff: chrome/renderer/plugins/plugin_placeholder.h

Issue 10382059: Quote CppBoundClass/CppVariant in namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix a long line Created 8 years, 7 months 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: chrome/renderer/plugins/plugin_placeholder.h
diff --git a/chrome/renderer/plugins/plugin_placeholder.h b/chrome/renderer/plugins/plugin_placeholder.h
index 6275284bae9d00319cbaf2e700ea2ad8fe64a898..d388eec77b6ab7c6a87f4faa178495e1a6730899 100644
--- a/chrome/renderer/plugins/plugin_placeholder.h
+++ b/chrome/renderer/plugins/plugin_placeholder.h
@@ -26,7 +26,7 @@ struct WebPluginInfo;
// (blocked or disabled).
class PluginPlaceholder : public content::RenderViewObserver,
public content::RenderProcessObserver,
- public CppBoundClass,
+ public webkit_glue::CppBoundClass,
public webkit::WebViewPlugin::Delegate {
public:
// Creates a new WebViewPlugin with a MissingPlugin as a delegate.
@@ -98,19 +98,21 @@ class PluginPlaceholder : public content::RenderViewObserver,
// Javascript callbacks:
// Load the blocked plugin by calling LoadPlugin().
// Takes no arguments, and returns nothing.
- void LoadCallback(const CppArgumentList& args, CppVariant* result);
+ void LoadCallback(const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
// Hide the blocked plugin by calling HidePlugin().
// Takes no arguments, and returns nothing.
- void HideCallback(const CppArgumentList& args, CppVariant* result);
+ void HideCallback(const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
// Opens chrome://plugins in a new tab.
// Takes no arguments, and returns nothing.
- void OpenAboutPluginsCallback(const CppArgumentList& args,
- CppVariant* result);
+ void OpenAboutPluginsCallback(const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
- void DidFinishLoadingCallback(const CppArgumentList& args,
- CppVariant* result);
+ void DidFinishLoadingCallback(const webkit_glue::CppArgumentList& args,
+ webkit_glue::CppVariant* result);
void OnLoadBlockedPlugins();
void OnSetIsPrerendering(bool is_prerendering);

Powered by Google App Engine
This is Rietveld 408576698