Get Chrome to build & link with USE_AURA on Windows again.BUG=noneTEST=none

Review URL: http://codereview.chromium.org/8174005

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

4 files changed, 6 insertions, 6 deletions

diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 2d1037c..73d28b2 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -110,7 +110,7 @@ bool WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) {
     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,
@@ -330,7 +330,7 @@ void WebPluginDelegateStub::OnSetContentAreaFocus(bool has_focus) {
     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,
@@ -338,7 +338,7 @@ void WebPluginDelegateStub::OnImeCompositionUpdated(
     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
 }
diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h
index a3be8a0..669abcc 100644
--- a/content/plugin/webplugin_delegate_stub.h
+++ b/content/plugin/webplugin_delegate_stub.h
@@ -81,7 +81,7 @@ class WebPluginDelegateStub : public IPC::Channel::Listener,
   void OnGetFormValue(string16* value, bool* success);
 
   void OnSetContentAreaFocus(bool has_focus);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   void OnImeCompositionUpdated(const string16& text,
                                const std::vector<int>& clauses,
                                const std::vector<int>& target,
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 4b167e1..4b717a0 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -748,7 +748,7 @@ void WebPluginProxy::URLRedirectResponse(bool allow, int resource_id) {
   Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id));
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 void WebPluginProxy::UpdateIMEStatus() {
   // Retrieve the IME status from a plug-in and send it to a renderer process
   // when the plug-in has updated it.
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
index 54f8894..100c767 100644
--- a/content/plugin/webplugin_proxy.h
+++ b/content/plugin/webplugin_proxy.h
@@ -168,7 +168,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
 
   virtual void URLRedirectResponse(bool allow, int resource_id);
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // Retrieves the IME status from a windowless plug-in and sends it to a
   // renderer process. A renderer process will convert the coordinates from
   // local to the window coordinates and send the converted coordinates to a