1 files changed, 16 insertions, 2 deletions
diff --git a/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index 0af6f88..ccb600a 100644
--- a/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -4,6 +4,10 @@
 
 #include "views/controls/button/native_button.h"
 
+#if defined(OS_LINUX)
+#include <gdk/gdkkeysyms.h>
+#endif
+
 #include "app/l10n_util.h"
 #include "base/logging.h"
 
@@ -67,12 +71,17 @@ void NativeButton::SetLabel(const std::wstring& label) {
 }
 
 void NativeButton::SetIsDefault(bool is_default) {
+#if defined(OS_WIN)
+  int return_code = VK_RETURN;
+#else
+  int return_code = GDK_Return;
+#endif
   if (is_default == is_default_)
     return;
   if (is_default)
-    AddAccelerator(Accelerator(VK_RETURN, false, false, false));
+    AddAccelerator(Accelerator(return_code, false, false, false));
   else
-    RemoveAccelerator(Accelerator(VK_RETURN, false, false, false));
+    RemoveAccelerator(Accelerator(return_code, false, false, false));
   SetAppearsAsDefault(is_default);
 }
 
@@ -105,6 +114,7 @@ gfx::Size NativeButton::GetPreferredSize() {
   sz.set_height(sz.height() + border.top() + border.bottom());
 
   // Clamp the size returned to at least the minimum size.
+#if defined(OS_WIN)
   if (!ignore_minimum_size_) {
     if (minimum_size_.width()) {
       int min_width = font_.horizontal_dlus_to_pixels(minimum_size_.width());
@@ -115,6 +125,10 @@ gfx::Size NativeButton::GetPreferredSize() {
       sz.set_height(std::max(static_cast<int>(sz.height()), min_height));
     }
   }
+#else
+    if (minimum_size_.width() || minimum_size_.height())
+      NOTIMPLEMENTED();
+#endif
 
   return sz;
 }