diff options
author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-30 18:52:44 +0000 |
---|---|---|
committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-30 18:52:44 +0000 |
commit | 1c34932902e6462e70980112ee045907492602c8 (patch) | |
tree | bb09aa097f0d2e1b386fc72456dee059c73bd32f /aura/demo/demo_main.cc | |
parent | 08858317710b1f9df9ebb786f7481cf7c6e0dbbe (diff) | |
download | chromium_src-1c34932902e6462e70980112ee045907492602c8.zip chromium_src-1c34932902e6462e70980112ee045907492602c8.tar.gz chromium_src-1c34932902e6462e70980112ee045907492602c8.tar.bz2 |
Revert 98850 - Proper MouseEvent targeting. Adds a Window method that locates a Window for a given point.
Also adds an Aura test suite.
http://crbug.com/93933
http://crbug.com/93943
TEST=see unittest
Review URL: http://codereview.chromium.org/7791030
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/7739002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'aura/demo/demo_main.cc')
-rw-r--r-- | aura/demo/demo_main.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/aura/demo/demo_main.cc b/aura/demo/demo_main.cc index a0758c5..09cfc29 100644 --- a/aura/demo/demo_main.cc +++ b/aura/demo/demo_main.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "aura/desktop.h" -#include "aura/event.h" #include "aura/window.h" #include "aura/window_delegate.h" #include "base/at_exit.h" @@ -13,6 +12,7 @@ #include "third_party/skia/include/core/SkXfermode.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/rect.h" @@ -23,10 +23,6 @@ class DemoWindowDelegate : public aura::WindowDelegate { public: explicit DemoWindowDelegate(SkColor color) : color_(color) {} - virtual bool OnMouseEvent(const aura::MouseEvent& event) OVERRIDE { - return true; - } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { canvas->AsCanvasSkia()->drawColor(color_, SkXfermode::kSrc_Mode); } |