Index: webkit/plugins/npapi/plugin_list.h |
=================================================================== |
--- webkit/plugins/npapi/plugin_list.h (revision 0) |
+++ webkit/plugins/npapi/plugin_list.h (working copy) |
@@ -14,8 +14,8 @@ |
#include "base/linked_ptr.h" |
#include "base/lock.h" |
#include "third_party/npapi/bindings/nphostapi.h" |
-#include "webkit/glue/plugins/plugin_group.h" |
-#include "webkit/glue/plugins/webplugininfo.h" |
+#include "webkit/plugins/npapi/plugin_group.h" |
+#include "webkit/plugins/npapi/webplugininfo.h" |
class GURL; |
@@ -26,10 +26,10 @@ |
} // namespace base |
-namespace NPAPI { |
+namespace webkit { |
+namespace npapi { |
-#define kDefaultPluginLibraryName FILE_PATH_LITERAL("default_plugin") |
-#define kGearsPluginLibraryName FILE_PATH_LITERAL("gears") |
+extern FilePath::CharType kDefaultPluginLibraryName[]; |
class PluginInstance; |
@@ -333,6 +333,7 @@ |
DISALLOW_COPY_AND_ASSIGN(PluginList); |
}; |
-} // namespace NPAPI |
+} // namespace npapi |
+} // namespace webkit |
#endif // WEBKIT_GLUE_PLUGINS_PLUGIN_LIST_H_ |