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

content/plugin/webplugin_delegate_stub.cc

 // 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 "content/plugin/webplugin_delegate_stub.h"
 
 #include "build/build_config.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
@@ skipping 92 matching lines @@
     IPC_MESSAGE_HANDLER(PluginMsg_Paint, OnPaint)
     IPC_MESSAGE_HANDLER(PluginMsg_DidPaint, OnDidPaint)
     IPC_MESSAGE_HANDLER(PluginMsg_GetPluginScriptableObject,
                         OnGetPluginScriptableObject)
     IPC_MESSAGE_HANDLER(PluginMsg_GetFormValue, OnGetFormValue)
     IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometry, OnUpdateGeometry)
     IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometrySync, OnUpdateGeometry)
     IPC_MESSAGE_HANDLER(PluginMsg_SendJavaScriptStream,
                         OnSendJavaScriptStream)
     IPC_MESSAGE_HANDLER(PluginMsg_SetContentAreaFocus, OnSetContentAreaFocus)
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
     IPC_MESSAGE_HANDLER(PluginMsg_ImeCompositionUpdated,
                         OnImeCompositionUpdated)
     IPC_MESSAGE_HANDLER(PluginMsg_ImeCompositionCompleted,
                         OnImeCompositionCompleted)
 #endif
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(PluginMsg_SetWindowFocus, OnSetWindowFocus)
     IPC_MESSAGE_HANDLER(PluginMsg_ContainerHidden, OnContainerHidden)
     IPC_MESSAGE_HANDLER(PluginMsg_ContainerShown, OnContainerShown)
     IPC_MESSAGE_HANDLER(PluginMsg_WindowFrameChanged, OnWindowFrameChanged)
@@ skipping 199 matching lines @@
                                                    bool success,
                                                    int notify_id) {
   delegate_->SendJavaScriptStream(url, result, success, notify_id);
 }
 
 void WebPluginDelegateStub::OnSetContentAreaFocus(bool has_focus) {
   if (delegate_)
     delegate_->SetContentAreaHasFocus(has_focus);
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 void WebPluginDelegateStub::OnImeCompositionUpdated(
     const string16& text,
     const std::vector<int>& clauses,
     const std::vector<int>& target,
     int cursor_position) {
   if (delegate_)
     delegate_->ImeCompositionUpdated(text, clauses, target, cursor_position);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   webplugin_->UpdateIMEStatus();
 #endif
 }
 
 void WebPluginDelegateStub::OnImeCompositionCompleted(const string16& text) {
   if (delegate_)
     delegate_->ImeCompositionCompleted(text);
 }
 #endif
 
@@ skipping 65 matching lines @@
       delegate_->CreateSeekableResourceClient(resource_id, range_request_id);
   webplugin_->OnResourceCreated(resource_id, resource_client);
 }
 
 #if defined(OS_MACOSX)
 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle(
     gfx::PluginWindowHandle window) {
   delegate_->set_windowed_handle(window);
 }
 #endif