summaryrefslogtreecommitdiffstats
path: root/views/controls/button/native_button.h
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls/button/native_button.h')
-rw-r--r--views/controls/button/native_button.h7
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