| Index: content/common/plugin_list_mac.mm
|
| ===================================================================
|
| --- content/common/plugin_list_mac.mm (revision 212369)
|
| +++ content/common/plugin_list_mac.mm (working copy)
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/plugins/npapi/plugin_list.h"
|
| +#include "content/common/plugin_list.h"
|
|
|
| #import <Carbon/Carbon.h>
|
| #import <Foundation/Foundation.h>
|
| @@ -20,9 +20,10 @@
|
| #include "base/strings/utf_string_conversions.h"
|
|
|
| using base::ScopedCFTypeRef;
|
| +using webkit::WebPluginInfo;
|
| +using webkit::WebPluginMimeType;
|
|
|
| -namespace webkit {
|
| -namespace npapi {
|
| +namespace content {
|
|
|
| namespace {
|
|
|
| @@ -301,5 +302,4 @@
|
| return !IsBlacklistedPlugin(info);
|
| }
|
|
|
| -} // namespace npapi
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|