2 files changed, 16 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 8bdae95..9a50aa6 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -87,6 +87,21 @@ void WifiConfigView::ContentsChanged(views::Textfield* sender,
   UpdateCanLogin();
 }
 
+bool WifiConfigView::HandleKeystroke(
+    views::Textfield* sender,
+    const views::Textfield::Keystroke& keystroke) {
+  if (sender == passphrase_textfield_) {
+    if (keystroke.GetKeyboardCode() == app::VKEY_RETURN) {
+      parent_->Accept();
+      return true;
+    } else if (keystroke.GetKeyboardCode() == app::VKEY_ESCAPE) {
+      parent_->Cancel();
+      return true;
+    }
+  }
+  return false;
+}
+
 void WifiConfigView::ButtonPressed(views::Button* sender,
                                    const views::Event& event) {
   if (sender == passphrase_visible_button_) {
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index 1fbae69..43078b70 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -39,9 +39,7 @@ class WifiConfigView : public views::View,
   virtual void ContentsChanged(views::Textfield* sender,
                                const string16& new_contents);
   virtual bool HandleKeystroke(views::Textfield* sender,
-                               const views::Textfield::Keystroke& keystroke) {
-    return false;
-  }
+                               const views::Textfield::Keystroke& keystroke);
 
   // views::ButtonListener
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);