diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 22:55:28 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 22:55:28 +0000 |
| commit | e5b307fe287acee54d60852addea15441243a4c7 (patch) | |
| tree | c35a43d270d83f098645de8a73ee9b417efc813c /webkit | |
| parent | ef402c3ba1147c39ab8b1f803b7bf8ebf1bbdefe (diff) | |
| download | chromium_src-e5b307fe287acee54d60852addea15441243a4c7.zip chromium_src-e5b307fe287acee54d60852addea15441243a4c7.tar.gz chromium_src-e5b307fe287acee54d60852addea15441243a4c7.tar.bz2 | |
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
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h index a475f05..0010d3b 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.h +++ b/webkit/plugins/npapi/webplugin_delegate_impl.h @@ -55,7 +55,7 @@ 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 @@ -147,7 +147,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate { // 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, @@ -331,7 +331,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate { 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_; @@ -371,7 +371,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate { 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. |