summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 17:08:06 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 17:08:06 +0000
commitf0b34eb57afd73e5851d1fbe02351102ee87bfc0 (patch)
tree8d3944eb2cc026f667f11513db7b17103fcb8f48 /chrome/browser/cocoa
parentdad44096af5b506d8dc4788fba8a587bc674ba36 (diff)
downloadchromium_src-f0b34eb57afd73e5851d1fbe02351102ee87bfc0.zip
chromium_src-f0b34eb57afd73e5851d1fbe02351102ee87bfc0.tar.gz
chromium_src-f0b34eb57afd73e5851d1fbe02351102ee87bfc0.tar.bz2
Make escape close the prefs window.
BUG=none TEST=fields in the middle of being editing should not save the value. Review URL: http://codereview.chromium.org/131113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.mm7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index 1763262..8e14a50 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -204,6 +204,13 @@ class PrefObserverBridge : public NotificationObserver {
context:context];
}
+// Called when the user hits the escape key. Closes the window. This will
+// automatically abandon/cancel any in-progress edits in text fields, we don't
+// have to do anything special.
+- (void)cancel:(id)sender {
+ [window performClose:self];
+}
+
// Record the user performed a certain action and save the preferences.
- (void)recordUserAction:(const wchar_t*)action {
UserMetrics::RecordComputedAction(action, profile_);