Fix 4830: We navigate back after closing the Save As dialog....

chrome/views/base_button.cc

 // Copyright (c) 2006-2008 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 "chrome/views/base_button.h"
 
 #include "base/base_drag_source.h"
 #include "chrome/browser/drag_utils.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/gfx/chrome_canvas.h"
@@ skipping 199 matching lines @@
 void BaseButton::NotifyClick(int mouse_event_flags) {
   mouse_event_flags_ = mouse_event_flags;
   if (listener_ != NULL)
     listener_->ButtonPressed(this);
   // NOTE: don't attempt to reset mouse_event_flags_ as the listener may have
   // deleted us.
 }
 
 bool BaseButton::OnKeyPressed(const KeyEvent& e) {
   if (state_ != BS_DISABLED) {
-    if ((e.GetCharacter() == VK_SPACE) || (e.GetCharacter() == VK_RETURN)) {
+    // Space sets button state to pushed. Enter clicks the button. This matches
+    // the Windows native behavior of buttons, where Space clicks the button
+    // on KeyRelease and Enter clicks the button on KeyPressed.
+    if (e.GetCharacter() == VK_SPACE) {
       SetState(BS_PUSHED);
       return true;
+    } else if  (e.GetCharacter() == VK_RETURN) {
+      SetState(BS_NORMAL);
+      NotifyClick(0);
+      return true;
     }
   }
   return false;
 }
 
 bool BaseButton::OnKeyReleased(const KeyEvent& e) {
   if (state_ != BS_DISABLED) {
-    if ((e.GetCharacter() == VK_SPACE) || (e.GetCharacter() == VK_RETURN)) {
+    if (e.GetCharacter() == VK_SPACE) {
       SetState(BS_NORMAL);
       NotifyClick(0);
       return true;
     }
   }
   return false;
 }
 
 void BaseButton::ShowContextMenu(int x, int y, bool is_mouse_gesture) {
   if (GetContextMenuController()) {
@@ skipping 61 matching lines @@
 void BaseButton::Paint(ChromeCanvas* canvas) {
   View::Paint(canvas);
 }
 
 void BaseButton::Paint(ChromeCanvas* canvas, bool for_drag) {
   Paint(canvas);
 }
 
 }  // namespace views