Chromium Code Reviews| Index: chrome/browser/ui/views/dropdown_bar_host.cc |
| =================================================================== |
| --- chrome/browser/ui/views/dropdown_bar_host.cc (revision 104318) |
| +++ chrome/browser/ui/views/dropdown_bar_host.cc (working copy) |
| @@ -18,22 +18,22 @@ |
| #include "views/focus/view_storage.h" |
| #include "views/widget/widget.h" |
| -#if defined(OS_WIN) |
| +#if defined(USE_AURA) |
| +#include "ui/gfx/scoped_sk_region.h" |
|
Emmanuel Saint-loubert-Bié
2011/10/06 19:02:09
my bad :-(
|
| +#elif defined(OS_WIN) |
| #include "base/win/scoped_gdi_object.h" |
| #elif defined(TOOLKIT_USES_GTK) |
| #include "ui/base/gtk/scoped_handle_gtk.h" |
| -#else |
| -#include "ui/gfx/scoped_sk_region.h" |
| #endif |
| namespace { |
| -#if defined(OS_WIN) |
| +#if defined(USE_AURA) |
| +typedef gfx::ScopedSkRegion ScopedPlatformRegion; |
| +#elif defined(OS_WIN) |
| typedef base::win::ScopedRegion ScopedPlatformRegion; |
| #elif defined(TOOLKIT_USES_GTK) |
| typedef ui::ScopedRegion ScopedPlatformRegion; |
| -#else |
| -typedef gfx::ScopedSkRegion ScopedPlatformRegion; |
| #endif |
| } // namespace |