summaryrefslogtreecommitdiffstats
path: root/ui/base/view_prop.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 19:20:28 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 19:20:28 +0000
commit40c15eb2c9d846fe70502e1f50ff7c2d6cb4ff67 (patch)
treeab9417f1e5345354ca8a5b47f3876536a87d297c /ui/base/view_prop.cc
parentfdede0fc51e8b8801a861f76d1a9d6d7c329a69d (diff)
downloadchromium_src-40c15eb2c9d846fe70502e1f50ff7c2d6cb4ff67.zip
chromium_src-40c15eb2c9d846fe70502e1f50ff7c2d6cb4ff67.tar.gz
chromium_src-40c15eb2c9d846fe70502e1f50ff7c2d6cb4ff67.tar.bz2
Make views_examples work in aura without ash.
This required a ScreenImpl implementation for windows+aura. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10241005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/view_prop.cc')
-rw-r--r--ui/base/view_prop.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/base/view_prop.cc b/ui/base/view_prop.cc
index 119228f..cb58553 100644
--- a/ui/base/view_prop.cc
+++ b/ui/base/view_prop.cc
@@ -13,7 +13,7 @@ class ViewProp::Data : public base::RefCounted<ViewProp::Data> {
public:
// Returns the Data* for the view/key pair. If |create| is false and |Get|
// has not been invoked for the view/key pair, NULL is returned.
- static void Get(gfx::NativeView view,
+ static void Get(gfx::AcceleratedWidget view,
const char* key,
bool create,
scoped_refptr<Data>* data) {
@@ -51,7 +51,7 @@ class ViewProp::Data : public base::RefCounted<ViewProp::Data> {
typedef std::set<Data*, DataComparator> DataSet;
- Data(gfx::NativeView view, const char* key)
+ Data(gfx::AcceleratedWidget view, const char* key)
: view_(view),
key_(key),
data_(NULL) {}
@@ -67,7 +67,7 @@ class ViewProp::Data : public base::RefCounted<ViewProp::Data> {
// The existing set of Data is stored here. ~Data removes from the set.
static DataSet* data_set_;
- const gfx::NativeView view_;
+ const gfx::AcceleratedWidget view_;
const char* key_;
void* data_;
@@ -77,7 +77,7 @@ class ViewProp::Data : public base::RefCounted<ViewProp::Data> {
// static
ViewProp::Data::DataSet* ViewProp::Data::data_set_ = NULL;
-ViewProp::ViewProp(gfx::NativeView view, const char* key, void* data) {
+ViewProp::ViewProp(gfx::AcceleratedWidget view, const char* key, void* data) {
Data::Get(view, key, true, &data_);
data_->set_data(data);
}
@@ -89,7 +89,7 @@ ViewProp::~ViewProp() {
}
// static
-void* ViewProp::GetValue(gfx::NativeView view, const char* key) {
+void* ViewProp::GetValue(gfx::AcceleratedWidget view, const char* key) {
scoped_refptr<Data> data;
Data::Get(view, key, false, &data);
return data.get() ? data->data() : NULL;