Get Chrome to build & link with USE_AURA on Windows again.

webkit/plugins/npapi/webplugin_delegate_impl.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 #define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 
 #include <string>
 #include <list>
 
@@ skipping 37 matching lines @@
 class PluginInstance;
 
 #if defined(OS_MACOSX)
 class WebPluginAcceleratedSurface;
 class ExternalDragTracker;
 #ifndef NP_NO_QUICKDRAW
 class QuickDrawDrawingManager;
 #endif  // NP_NO_QUICKDRAW
 #endif  // OS_MACOSX
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 class WebPluginIMEWin;
 #endif  // OS_WIN
 
 // An implementation of WebPluginDelegate that runs in the plugin process,
 // proxied from the renderer by WebPluginDelegateProxy.
 class WebPluginDelegateImpl : public WebPluginDelegate {
  public:
   enum PluginQuirks {
     PLUGIN_QUIRK_SETWINDOW_TWICE = 1,  // Win32
     PLUGIN_QUIRK_THROTTLE_WM_USER_PLUS_ONE = 2,  // Win32
@@ skipping 71 matching lines @@
 
   // Returns the path for the library implementing this plugin.
   FilePath GetPluginPath();
 
   // Returns a combination of PluginQuirks.
   int GetQuirks() const { return quirks_; }
 
   // Informs the plugin that the view it is in has gained or lost focus.
   void SetContentAreaHasFocus(bool has_focus);
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // Informs the plug-in that an IME has changed its status.
   void ImeCompositionUpdated(const string16& text,
                              const std::vector<int>& clauses,
                              const std::vector<int>& target,
                              int cursor_position);
 
   // Informs the plugin that IME composition has completed./ If |text| is empty,
   // IME was cancelled.
   void ImeCompositionCompleted(const string16& text);
 
@@ skipping 163 matching lines @@
   gfx::Rect windowed_last_pos_;
 
   bool windowed_did_set_window_;
 
   // used by windowed and windowless plugins
   bool windowless_;
 
   WebPlugin* plugin_;
   scoped_refptr<PluginInstance> instance_;
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // Original wndproc before we subclassed.
   WNDPROC plugin_wnd_proc_;
 
   // Used to throttle WM_USER+1 messages in Flash.
   uint32 last_message_;
   bool is_calling_wndproc;
 
   // An IME emulator used by a windowless plug-in to retrieve IME data through
   // IMM32 functions.
   scoped_ptr<WebPluginIMEWin> plugin_ime_;
@@ skipping 19 matching lines @@
   // Ensure pixmap_ exists and is at least width by height pixels.
   void EnsurePixmapAtLeastSize(int width, int height);
 #endif
 
   gfx::PluginWindowHandle parent_;
   NPWindow window_;
   gfx::Rect window_rect_;
   gfx::Rect clip_rect_;
   int quirks_;
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // Windowless plugins don't have keyboard focus causing issues with the
   // plugin not receiving keyboard events if the plugin enters a modal
   // loop like TrackPopupMenuEx or MessageBox, etc.
   // This is a basic issue with windows activation and focus arising due to
   // the fact that these windows are created by different threads. Activation
   // and focus are thread specific states, and if the browser has focus,
   // the plugin may not have focus.
   // To fix a majority of these activation issues we create a dummy visible
   // child window to which we set focus whenever the windowless plugin
   // receives a WM_LBUTTONDOWN/WM_RBUTTONDOWN message via NPP_HandleEvent.
@@ skipping 165 matching lines @@
   // True if NPP_New did not return an error.
   bool creation_succeeded_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl);
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_