| Index: webkit/plugins/npapi/plugin_lib_mac.mm
|
| ===================================================================
|
| --- webkit/plugins/npapi/plugin_lib_mac.mm (revision 0)
|
| +++ webkit/plugins/npapi/plugin_lib_mac.mm (working copy)
|
| @@ -4,7 +4,7 @@
|
|
|
| #import <Carbon/Carbon.h>
|
|
|
| -#include "webkit/glue/plugins/plugin_lib.h"
|
| +#include "webkit/plugins/npapi/plugin_lib.h"
|
|
|
| #include "base/mac/scoped_cftyperef.h"
|
| #include "base/native_library.h"
|
| @@ -13,18 +13,19 @@
|
| #include "base/string_util.h"
|
| #include "base/sys_string_conversions.h"
|
| #include "base/utf_string_conversions.h"
|
| -#include "webkit/glue/plugins/plugin_list.h"
|
| +#include "webkit/plugins/npapi/plugin_list.h"
|
|
|
| -static const short kSTRTypeDefinitionResourceID = 128;
|
| -static const short kSTRTypeDescriptionResourceID = 127;
|
| -static const short kSTRPluginDescriptionResourceID = 126;
|
| -
|
| using base::mac::ScopedCFTypeRef;
|
|
|
| -namespace NPAPI {
|
| +namespace webkit {
|
| +namespace npapi {
|
|
|
| namespace {
|
|
|
| +const short kSTRTypeDefinitionResourceID = 128;
|
| +const short kSTRTypeDescriptionResourceID = 127;
|
| +const short kSTRPluginDescriptionResourceID = 126;
|
| +
|
| NSDictionary* GetMIMETypes(CFBundleRef bundle) {
|
| NSString* mime_filename =
|
| (NSString*)CFBundleGetValueForInfoDictionaryKey(bundle,
|
| @@ -345,4 +346,5 @@
|
| return false;
|
| }
|
|
|
| -} // namespace NPAPI
|
| +} // namespace npapi
|
| +} // namespace webkit
|
|
|