| Index: content/child/npapi/webplugin_delegate_impl_mac.mm
|
| ===================================================================
|
| --- content/child/npapi/webplugin_delegate_impl_mac.mm (revision 0)
|
| +++ content/child/npapi/webplugin_delegate_impl_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/webplugin_delegate_impl.h"
|
| +#include "content/child/npapi/webplugin_delegate_impl.h"
|
|
|
| #import <Cocoa/Cocoa.h>
|
| #import <QuartzCore/QuartzCore.h>
|
| @@ -17,28 +17,28 @@
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "content/child/npapi/plugin_instance.h"
|
| +#include "content/child/npapi/plugin_lib.h"
|
| +#include "content/child/npapi/plugin_web_event_converter_mac.h"
|
| +#include "content/child/npapi/webplugin.h"
|
| +#include "content/child/npapi/webplugin_accelerated_surface_mac.h"
|
| #include "skia/ext/skia_utils_mac.h"
|
| #include "third_party/WebKit/public/web/WebInputEvent.h"
|
| #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
|
| #include "webkit/common/cursors/webcursor.h"
|
| -#include "webkit/plugins/npapi/plugin_instance.h"
|
| -#include "webkit/plugins/npapi/plugin_lib.h"
|
| -#include "webkit/plugins/npapi/plugin_web_event_converter_mac.h"
|
| -#include "webkit/plugins/npapi/webplugin.h"
|
| -#include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
|
|
|
| using WebKit::WebKeyboardEvent;
|
| using WebKit::WebInputEvent;
|
| using WebKit::WebMouseEvent;
|
| using WebKit::WebMouseWheelEvent;
|
| +using webkit::WebPluginInfo;
|
|
|
| // Important implementation notes: The Mac definition of NPAPI, particularly
|
| // the distinction between windowed and windowless modes, differs from the
|
| // Windows and Linux definitions. Most of those differences are
|
| // accomodated by the WebPluginDelegate class.
|
|
|
| -namespace webkit {
|
| -namespace npapi {
|
| +namespace content {
|
|
|
| namespace {
|
|
|
| @@ -726,5 +726,4 @@
|
| PluginVisibilityChanged();
|
| }
|
|
|
| -} // namespace npapi
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|