diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 04:18:10 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 04:18:10 +0000 |
| commit | 569382c32c61b0821c9a79a9e0337757f18fd279 (patch) | |
| tree | ac5d032abaddd3db8428793b01c0b7edfa821f2f /content/renderer | |
| parent | 7a8966cf71df7b5b634870a1bae3b52a3dd18fa0 (diff) | |
| download | chromium_src-569382c32c61b0821c9a79a9e0337757f18fd279.zip chromium_src-569382c32c61b0821c9a79a9e0337757f18fd279.tar.gz chromium_src-569382c32c61b0821c9a79a9e0337757f18fd279.tar.bz2 | |
+ Adding new stub methods to chrome/browser/ui/views/aura/aura_init.cc since window_delegate.h has 3 new pure virtual functions.
+ Adding missing #include <cairo/cairo.h> to content/renderer/webplugin_delegate_proxy.cc so that WebPluginDelegateProxy::BackgroundChanged() can compile.
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/8051023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/webplugin_delegate_proxy.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index 3b7223c..1caf3ee 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -6,6 +6,8 @@ #if defined(TOOLKIT_USES_GTK) #include <gtk/gtk.h> +#elif defined(USE_X11) +#include <cairo/cairo.h> #endif #include <algorithm> |