diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 23:48:46 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 23:48:46 +0000 |
| commit | a684f124276f04ff2ad362c1f2d464dd013b2473 (patch) | |
| tree | b8e2d259233be621d39abb463ee1503a82899010 /views | |
| parent | 0bff60882113fd7178012521e71507a24f0b009a (diff) | |
| download | chromium_src-a684f124276f04ff2ad362c1f2d464dd013b2473.zip chromium_src-a684f124276f04ff2ad362c1f2d464dd013b2473.tar.gz chromium_src-a684f124276f04ff2ad362c1f2d464dd013b2473.tar.bz2 | |
Remove more 'using' declarations of Scoped* from scoped_handle_win.h
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6040002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/views/view.cc b/views/view.cc index a33d5be..96dfdf1 100644 --- a/views/view.cc +++ b/views/view.cc @@ -12,7 +12,6 @@ #include "app/drag_drop_types.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/scoped_handle.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/path.h" @@ -26,6 +25,7 @@ #include "views/window/window.h" #if defined(OS_WIN) +#include "base/win/scoped_gdi_object.h" #include "views/accessibility/view_accessibility.h" #endif #if defined(OS_LINUX) @@ -450,11 +450,12 @@ bool View::HitTest(const gfx::Point& l) const { if (HasHitTestMask()) { gfx::Path mask; GetHitTestMask(&mask); - ScopedRegion rgn(mask.CreateNativeRegion()); // TODO: can this use SkRegion's contains instead? #if defined(OS_WIN) + base::win::ScopedRegion rgn(mask.CreateNativeRegion()); return !!PtInRegion(rgn, l.x(), l.y()); #elif defined(TOOLKIT_USES_GTK) + ScopedRegion rgn(mask.CreateNativeRegion()); return gdk_region_point_in(rgn.Get(), l.x(), l.y()); #endif } |