| Index: content/browser/renderer_host/gtk_plugin_container.h
|
| ===================================================================
|
| --- content/browser/renderer_host/gtk_plugin_container.h (revision 212369)
|
| +++ content/browser/renderer_host/gtk_plugin_container.h (working copy)
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_H_
|
| -#define WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_H_
|
| +#ifndef CONTENT_BROWSER_RENDERER_HOST_GTK_PLUGIN_CONTAINER_H_
|
| +#define CONTENT_BROWSER_RENDERER_HOST_GTK_PLUGIN_CONTAINER_H_
|
|
|
| // Windowed plugins are embedded via XEmbed, which is implemented by
|
| // GtkPlug/GtkSocket. But we want to control sizing and positioning
|
| @@ -15,8 +15,7 @@
|
|
|
| typedef struct _GtkWidget GtkWidget;
|
|
|
| -namespace webkit {
|
| -namespace npapi {
|
| +namespace content {
|
|
|
| // Return a new GtkPluginContainer.
|
| // Intentionally GTK-style here since we're creating a custom GTK widget.
|
| @@ -26,7 +25,6 @@
|
| // Sets the size of the GtkPluginContainer.
|
| void gtk_plugin_container_set_size(GtkWidget *widget, int width, int height);
|
|
|
| -} // namespace npapi
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_H_
|
| +#endif // CONTENT_BROWSER_RENDERER_HOST_GTK_PLUGIN_CONTAINER_H_
|
|
|