diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 00:32:29 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 00:32:29 +0000 |
| commit | 1b9f7ab1f8abf238acf180a029b25cf41cc7ec07 (patch) | |
| tree | efc6729cf1abb99946ddf2ba5fb0ed7282fa67ef /views | |
| parent | a2848fd3865325eb9a15797e0345c6205dbb5684 (diff) | |
| download | chromium_src-1b9f7ab1f8abf238acf180a029b25cf41cc7ec07.zip chromium_src-1b9f7ab1f8abf238acf180a029b25cf41cc7ec07.tar.gz chromium_src-1b9f7ab1f8abf238acf180a029b25cf41cc7ec07.tar.bz2 | |
Revert 79768 - Fixed Clang error to http://codereview.chromium.org/6770014/
BUG=none
TEST=none
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/6749046
TBR=dhollowa@chromium.org
Review URL: http://codereview.chromium.org/6749047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/button/native_button.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/views/controls/button/native_button.h b/views/controls/button/native_button.h index f3cec27..4c0e7fa 100644 --- a/views/controls/button/native_button.h +++ b/views/controls/button/native_button.h @@ -120,8 +120,8 @@ class NativeButton : public TextButton { DISALLOW_COPY_AND_ASSIGN(NativeButton); }; -#else -// TODO(saintlou): Windows and Clang do not like typedef, it +#elif defined(OS_WIN) +// TODO(saintlou): Windows does not like typedef, in particluar it // chokes in other modules that have a forward declaration for // NativeButton class NativeButton : public NativeButtonBase { @@ -133,6 +133,9 @@ class NativeButton : public NativeButtonBase { private: DISALLOW_COPY_AND_ASSIGN(NativeButton); }; +#else +// Keep the same implementation as before for non-touch case +typedef NativeButtonBase NativeButton; #endif } // namespace views |