diff options
| -rw-r--r-- | chrome/browser/ui/views/aura/aura_init.cc | 7 | ||||
| -rw-r--r-- | content/renderer/webplugin_delegate_proxy.cc | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/ui/views/aura/aura_init.cc b/chrome/browser/ui/views/aura/aura_init.cc index 33e633a..c9927e2 100644 --- a/chrome/browser/ui/views/aura/aura_init.cc +++ b/chrome/browser/ui/views/aura/aura_init.cc @@ -35,6 +35,13 @@ class DemoWindowDelegate : public aura::WindowDelegate { virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE { return true; } + virtual bool ShouldActivate(aura::MouseEvent* event) OVERRIDE { + return true; + } + virtual void OnActivated() OVERRIDE { + } + virtual void OnLostActive() OVERRIDE { + } virtual void OnCaptureLost() OVERRIDE { } virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { 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> |