Index: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm |
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm |
index 30d2f598da30cabc50ebed3f3f82695b6a4122c6..e942d0eadfaaa708f48900990b494b9cd0c4e311 100644 |
--- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm |
+++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm |
@@ -4,6 +4,7 @@ |
#import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" |
+#include "base/mac/mac_util.h" |
Mark Mentovai
2011/08/09 18:44:37
Unneeded.
|
#include "base/string_util.h" |
#include "base/sys_string_conversions.h" |
#include "chrome/app/chrome_command_ids.h" // IDC_* |
@@ -398,12 +399,14 @@ BOOL ThePasteboardIsTooDamnBig() { |
} |
// If the escape key was pressed and no revert happened and we're in |
- // fullscreen mode, make it resign key. |
+ // fullscreen mode, give focus to the web contents, which may dismiss the |
+ // overlay. |
if (cmd == @selector(cancelOperation:)) { |
BrowserWindowController* windowController = |
[BrowserWindowController browserWindowControllerForView:self]; |
- if ([windowController inPresentationMode]) { |
+ if ([windowController isFullscreen]) { |
[windowController focusTabContents]; |
+ textChangedByKeyEvents_ = NO; |
return; |
} |
} |