Get chrome to link with USE_AURA

http://crbug.com/93947
TEST=none
R=sadrul
TBR=jabdelmalek for the content/webkit stubs
Review URL: http://codereview.chromium.org/7841012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99993 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 92 insertions, 1 deletions

diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 16acc67..1112558 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -175,6 +175,7 @@
         '../plugins/npapi/webplugin_delegate.h',
         '../plugins/npapi/webplugin_delegate_impl.cc',
         '../plugins/npapi/webplugin_delegate_impl.h',
+        '../plugins/npapi/webplugin_delegate_impl_aura.cc',
         '../plugins/npapi/webplugin_delegate_impl_gtk.cc',
         '../plugins/npapi/webplugin_delegate_impl_mac.mm',
         '../plugins/npapi/webplugin_delegate_impl_win.cc',
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h
index 84c46b9..19ff30b 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl.h
+++ b/webkit/plugins/npapi/webplugin_delegate_impl.h
@@ -474,7 +474,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
   // The url with which the plugin was instantiated.
   std::string plugin_url_;
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // Indicates the end of a user gesture period.
   void OnUserGestureEnd();
 
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_aura.cc b/webkit/plugins/npapi/webplugin_delegate_impl_aura.cc
new file mode 100644
index 0000000..e663306
--- /dev/null
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_aura.cc
@@ -0,0 +1,90 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "base/basictypes.h"
+#include "base/file_util.h"
+#include "base/message_loop.h"
+#include "base/process_util.h"
+#include "base/metrics/stats_counters.h"
+#include "base/string_util.h"
+#include "skia/ext/platform_canvas.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+#include "ui/gfx/blit.h"
+#include "webkit/plugins/npapi/gtk_plugin_container.h"
+#include "webkit/plugins/npapi/plugin_constants_win.h"
+#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_stream_url.h"
+#include "webkit/plugins/npapi/webplugin.h"
+
+#include "third_party/npapi/bindings/npapi_x11.h"
+
+using WebKit::WebCursorInfo;
+using WebKit::WebKeyboardEvent;
+using WebKit::WebInputEvent;
+using WebKit::WebMouseEvent;
+
+namespace webkit {
+namespace npapi {
+
+WebPluginDelegateImpl::WebPluginDelegateImpl(
+    gfx::PluginWindowHandle containing_view,
+    PluginInstance *instance) {
+}
+
+WebPluginDelegateImpl::~WebPluginDelegateImpl() {
+}
+
+bool WebPluginDelegateImpl::PlatformInitialize() {
+  return true;
+}
+
+void WebPluginDelegateImpl::PlatformDestroyInstance() {
+  // Nothing to do here.
+}
+
+void WebPluginDelegateImpl::Paint(WebKit::WebCanvas* canvas,
+                                  const gfx::Rect& rect) {
+}
+
+bool WebPluginDelegateImpl::WindowedCreatePlugin() {
+  return true;
+}
+
+void WebPluginDelegateImpl::WindowedDestroyWindow() {
+}
+
+bool WebPluginDelegateImpl::WindowedReposition(
+    const gfx::Rect& window_rect,
+    const gfx::Rect& clip_rect) {
+  return true;
+}
+
+void WebPluginDelegateImpl::WindowedSetWindow() {
+}
+
+void WebPluginDelegateImpl::WindowlessUpdateGeometry(
+    const gfx::Rect& window_rect,
+    const gfx::Rect& clip_rect) {
+}
+
+void WebPluginDelegateImpl::WindowlessPaint(gfx::NativeDrawingContext context,
+                                            const gfx::Rect& damage_rect) {
+}
+
+bool WebPluginDelegateImpl::PlatformSetPluginHasFocus(bool focused) {
+  return true;
+}
+
+bool WebPluginDelegateImpl::PlatformHandleInputEvent(
+    const WebInputEvent& event, WebCursorInfo* cursor_info) {
+  return false;
+}
+
+}  // namespace npapi
+}  // namespace webkit