Remove some code inside USE_AURA and OS_WIN ifdefs.

content/child/npapi/webplugin_delegate_impl_win.cc

 // Copyright (c) 2012 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 "content/child/npapi/webplugin_delegate_impl.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 70 matching lines @@
     LAZY_INSTANCE_INITIALIZER;
 
 // Helper object for patching the RegEnumKeyExW API.
 base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w =
     LAZY_INSTANCE_INITIALIZER;
 
 // Helper object for patching the GetProcAddress API.
 base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_proc_address =
     LAZY_INSTANCE_INITIALIZER;
 
-#if defined(USE_AURA)
 base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_window_from_point =
     LAZY_INSTANCE_INITIALIZER;
-#endif
 
 // http://crbug.com/16114
 // Enforces providing a valid device context in NPWindow, so that NPP_SetWindow
 // is never called with NPNWindoTypeDrawable and NPWindow set to NULL.
 // Doing so allows removing NPP_SetWindow call during painting a windowless
 // plugin, which otherwise could trigger layout change while painting by
 // invoking NPN_Evaluate. Which would cause bad, bad crashes. Bad crashes.
 // TODO(dglazkov): If this approach doesn't produce regressions, move class to
 // webplugin_delegate_impl.h and implement for other platforms.
 class DrawableContextEnforcer {
@@ skipping 154 matching lines @@
   if (instance_->mime_type() == kFlashPluginSwfMimeType ||
       filename == kFlashPlugin) {
     // Flash only requests windowless plugins if we return a Mozilla user
     // agent.
     instance_->set_use_mozilla_user_agent();
     quirks_ |= PLUGIN_QUIRK_THROTTLE_WM_USER_PLUS_ONE;
     quirks_ |= PLUGIN_QUIRK_PATCH_SETCURSOR;
     quirks_ |= PLUGIN_QUIRK_ALWAYS_NOTIFY_SUCCESS;
     quirks_ |= PLUGIN_QUIRK_HANDLE_MOUSE_CAPTURE;
     quirks_ |= PLUGIN_QUIRK_EMULATE_IME;
-#if defined(USE_AURA)
     quirks_ |= PLUGIN_QUIRK_FAKE_WINDOW_FROM_POINT;
-#endif
   } else if (filename == kAcrobatReaderPlugin) {
     // Check for the version number above or equal 9.
     int major_version = GetPluginMajorVersion(plugin_info);
     if (major_version >= 9) {
       quirks_ |= PLUGIN_QUIRK_DIE_AFTER_UNLOAD;
       // 9.2 needs this.
       quirks_ |= PLUGIN_QUIRK_SETWINDOW_TWICE;
     }
     quirks_ |= PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS;
   } else if (plugin_info.name.find(L"Windows Media Player") !=
@@ skipping 133 matching lines @@
   // and use them to retrieve IME data. We add a patch to this function so we
   // can dispatch these IMM32 calls to the WebPluginIMEWin class, which emulates
   // IMM32 functions for Flash.
   if (!g_iat_patch_get_proc_address.Pointer()->is_patched() &&
       (quirks_ & PLUGIN_QUIRK_EMULATE_IME)) {
     g_iat_patch_get_proc_address.Pointer()->Patch(
         GetPluginPath().value().c_str(), "kernel32.dll", "GetProcAddress",
         GetProcAddressPatch);
   }
 
-#if defined(USE_AURA)
   if (windowless_ && !g_iat_patch_window_from_point.Pointer()->is_patched() &&
       (quirks_ & PLUGIN_QUIRK_FAKE_WINDOW_FROM_POINT)) {
     g_iat_patch_window_from_point.Pointer()->Patch(
         GetPluginPath().value().c_str(), "user32.dll", "WindowFromPoint",
         WebPluginDelegateImpl::WindowFromPointPatch);
   }
-#endif
+
   return true;
 }
 
 void WebPluginDelegateImpl::PlatformDestroyInstance() {
   if (!instance_->plugin_lib())
     return;
 
   // Unpatch if this is the last plugin instance.
   if (instance_->plugin_lib()->instance_count() != 1)
     return;
 
   if (g_iat_patch_set_cursor.Pointer()->is_patched())
     g_iat_patch_set_cursor.Pointer()->Unpatch();
 
   if (g_iat_patch_track_popup_menu.Pointer()->is_patched())
     g_iat_patch_track_popup_menu.Pointer()->Unpatch();
 
   if (g_iat_patch_reg_enum_key_ex_w.Pointer()->is_patched())
     g_iat_patch_reg_enum_key_ex_w.Pointer()->Unpatch();
 
-#if defined(USE_AURA)
   if (g_iat_patch_window_from_point.Pointer()->is_patched())
     g_iat_patch_window_from_point.Pointer()->Unpatch();
-#endif
 
   if (mouse_hook_) {
     UnhookWindowsHookEx(mouse_hook_);
     mouse_hook_ = NULL;
   }
 }
 
 void WebPluginDelegateImpl::Paint(SkCanvas* canvas, const gfx::Rect& rect) {
   if (windowless_ && skia::SupportsPlatformPaint(canvas)) {
     skia::ScopedPlatformPaint scoped_platform_paint(canvas);
@@ skipping 1020 matching lines @@
 
 // static
 FARPROC WINAPI WebPluginDelegateImpl::GetProcAddressPatch(HMODULE module,
                                                           LPCSTR name) {
   FARPROC imm_function = WebPluginIMEWin::GetProcAddress(name);
   if (imm_function)
     return imm_function;
   return ::GetProcAddress(module, name);
 }
 
-#if defined(USE_AURA)
 HWND WINAPI WebPluginDelegateImpl::WindowFromPointPatch(POINT point) {
   HWND window = WindowFromPoint(point);
   if (::ScreenToClient(window, &point)) {
     HWND child = ChildWindowFromPoint(window, point);
     if (::IsWindow(child) &&
         ::GetProp(child, content::kPluginDummyParentProperty))
       return child;
   }
   return window;
 }
-#endif
 
 void WebPluginDelegateImpl::HandleCaptureForMessage(HWND window,
                                                     UINT message) {
   if (gfx::GetClassName(window) != base::string16(kNativeWindowClassName))
     return;
 
   switch (message) {
     case WM_LBUTTONDOWN:
     case WM_MBUTTONDOWN:
     case WM_RBUTTONDOWN:
@@ skipping 11 matching lines @@
     case WM_RBUTTONUP:
       ::ReleaseCapture();
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace content