| Index: ui/base/view_prop.h
|
| ===================================================================
|
| --- ui/base/view_prop.h (revision 134107)
|
| +++ ui/base/view_prop.h (working copy)
|
| @@ -11,8 +11,8 @@
|
| #include "ui/base/ui_export.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| -#if defined(USE_AURA) || defined(OS_LINUX) || defined(OS_MACOSX)
|
| -#error view_prop.h is only for win, non aura build
|
| +#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(USE_AURA))
|
| +#error view_prop.h is only for windows and aura builds.
|
| #endif
|
|
|
| namespace ui {
|
| @@ -28,12 +28,12 @@
|
| //
|
| // ViewProp does *not* make a copy of the char*, the pointer is used for
|
| // sorting.
|
| - ViewProp(gfx::NativeView view, const char* key, void* data);
|
| + ViewProp(gfx::AcceleratedWidget view, const char* key, void* data);
|
| ~ViewProp();
|
|
|
| // Returns the value associated with the view/key pair, or NULL if there is
|
| // none.
|
| - static void* GetValue(gfx::NativeView view, const char* key);
|
| + static void* GetValue(gfx::AcceleratedWidget view, const char* key);
|
|
|
| // Returns the key.
|
| const char* Key() const;
|
|
|