Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Unified Diff: content/plugin/webplugin_delegate_stub.cc

Issue 8174005: Get Chrome to build & link with USE_AURA on Windows again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/plugin/webplugin_delegate_stub.h ('k') | content/plugin/webplugin_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/webplugin_delegate_stub.cc
===================================================================
--- content/plugin/webplugin_delegate_stub.cc (revision 104318)
+++ content/plugin/webplugin_delegate_stub.cc (working copy)
@@ -110,7 +110,7 @@
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 @@
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 @@
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
}
« no previous file with comments | « content/plugin/webplugin_delegate_stub.h ('k') | content/plugin/webplugin_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698