From 48a96abb2464e6341d876c0a9c952764ce4a7a2e Mon Sep 17 00:00:00 2001 From: "saintlou@chromium.org" Date: Thu, 30 Jun 2011 21:40:11 +0000 Subject: Reverted 7285007 now that r91197 has landed Basically having TOUCH_UI => pure-views exposed an issue when pure-views are enabled and deskop is not. Not that this last issue is fixed we can revert that workaround. TBR=sky@chromium.org BUG=none TEST=TouchUi tests Review URL: http://codereview.chromium.org/7294008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91203 0039d316-1c4b-4281-b951-d872f2087c98 --- views/widget/widget.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'views') diff --git a/views/widget/widget.cc b/views/widget/widget.cc index b42f355..82f3fec 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -196,9 +196,11 @@ void Widget::SetPureViews(bool pure) { // static bool Widget::IsPureViews() { -// TODO(saintlou): we would like #if defined(TOUCH_UI) => return true. -// However at the moment another bug is preventing us from doing that. +#if defined(TOUCH_UI) + return true; +#else return use_pure_views; +#endif } // static -- cgit v1.1