Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: ui/base/view_prop.h

Issue 10241005: Make win_aura work without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698