Grab bag of bugfixes for Lion fullscreen mode.

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm

 // Copyright (c) 2011 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.
 
 #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_*
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
@@ skipping 374 matching lines @@
 
   if (observer && observer->OnDoCommandBySelector(cmd)) {
     // The observer should already be aware of any changes to the text, so
     // setting |textChangedByKeyEvents_| to NO to prevent its OnDidChange()
     // method from being called unnecessarily.
     textChangedByKeyEvents_ = NO;
     return;
   }
 
   // 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;
     }
   }
 
   [super doCommandBySelector:cmd];
 }
 
 - (void)setAttributedString:(NSAttributedString*)aString {
   NSTextStorage* textStorage = [self textStorage];
   DCHECK(textStorage);
   [textStorage setAttributedString:aString];
 
   // The text has been changed programmatically. The observer should know
   // this change, so setting |textChangedByKeyEvents_| to NO to
   // prevent its OnDidChange() method from being called unnecessarily.
   textChangedByKeyEvents_ = NO;
 }
 
 - (void)mouseDown:(NSEvent*)theEvent {
   // Close the popup before processing the event.
   AutocompleteTextFieldObserver* observer = [self observer];
   if (observer)
     observer->ClosePopup();
 
   [super mouseDown:theEvent];
 }
 
 @end