MacViews: Don't click views::Link on pressing Return key.

ui/views/controls/link.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/link.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/native_cursor.h"
+#include "ui/views/style/platform_style.h"
 
 namespace views {
 
 const char Link::kViewClassName[] = "Link";
 
 Link::Link() : Link(base::string16()) {}
 
 Link::Link(const base::string16& title)
     : Label(title),
       requested_enabled_color_(gfx::kPlaceholderColor),
@@ skipping 50 matching lines @@
   }
 }
 
 void Link::OnMouseCaptureLost() {
   SetPressed(false);
 }
 
 bool Link::OnKeyPressed(const ui::KeyEvent& event) {
   bool activate = (((event.key_code() == ui::VKEY_SPACE) &&
                     (event.flags() & ui::EF_ALT_DOWN) == 0) ||
-                   (event.key_code() == ui::VKEY_RETURN));
+                   (event.key_code() == ui::VKEY_RETURN &&
+                    PlatformStyle::kReturnClicksFocusedControl));
   if (!activate)
     return false;
 
   SetPressed(false);
 
   // Focus the link on key pressed.
   RequestFocus();
 
   if (listener_)
     listener_->LinkClicked(this, event.flags());
@@ skipping 12 matching lines @@
     if (listener_)
       listener_->LinkClicked(this, event->flags());
   } else {
     SetPressed(false);
     return;
   }
   event->SetHandled();
 }
 
 bool Link::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
-  // Make sure we don't process space or enter as accelerators.
+  // Don't process Space and Return (depending on the platform) as an
+  // accelerator.
   return (event.key_code() == ui::VKEY_SPACE) ||

[tapted, 2017/01/05 02:26:54]

nit: the parens around this `==` look odd

[karandeepb, 2017/01/05 11:15:40]

Done.

-      (event.key_code() == ui::VKEY_RETURN);
+         (event.key_code() == ui::VKEY_RETURN &&
+          PlatformStyle::kReturnClicksFocusedControl);
 }
 
 void Link::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   Label::GetAccessibleNodeData(node_data);
   node_data->role = ui::AX_ROLE_LINK;
 }
 
 void Link::OnEnabledChanged() {
   RecalculateFont();
   View::OnEnabledChanged();
@@ skipping 104 matching lines @@
   if (GetNativeTheme()) {
     return GetNativeTheme()->GetSystemColor(
         pressed_ ? ui::NativeTheme::kColorId_LinkPressed
                  : ui::NativeTheme::kColorId_LinkEnabled);
   }
 
   return gfx::kPlaceholderColor;
 }
 
 }  // namespace views