[Mac] Polish the search engine manager

chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm

 // Copyright (c) 2009 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/cocoa/edit_search_engine_cocoa_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #import "base/mac_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 84 matching lines @@
   // will not let the user save. If this is an edit, then this will set all
   // the images to the "valid" state.
   [self validateFields];
 }
 
 // When the window closes, clean ourselves up.
 - (void)windowWillClose:(NSNotification*)notif {
   [self autorelease];
 }
 
+// Performs the logic of closing the window. If we are a sheet, then it ends the
+// modal session; otherwise, it closes the window.
+- (void)doClose {
+  if ([[self window] isSheet]) {
+    [NSApp endSheet:[self window]];
+  } else {
+    [[self window] close];
+  }
+}
+
 - (IBAction)cancel:(id)sender {
-  [[self window] close];
+  [self doClose];
 }
 
 - (IBAction)save:(id)sender {
   DCHECK([self validateFields]);
   std::wstring title = base::SysNSStringToWide([nameField_ stringValue]);
   std::wstring keyword = base::SysNSStringToWide([keywordField_ stringValue]);
   std::wstring url = base::SysNSStringToWide([urlField_ stringValue]);
   controller_->AcceptAddOrEdit(title, keyword, url);
-  [[self window] close];
+  [self doClose];
 }
 
 // Delegate method for the text fields.
 
 - (void)controlTextDidChange:(NSNotification*)notif {
   [self validateFields];
 }
 
 - (void)controlTextDidEndEditing:(NSNotification*)notif {
   [self validateFields];
@@ skipping 39 matching lines @@
            toolTip:IDS_SEARCH_ENGINES_INVALID_URL_TT
       forImageView:urlImage_
          textField:urlField_];
 
   BOOL isValid = (titleValid && keywordValid && urlValid);
   [doneButton_ setEnabled:isValid];
   return isValid;
 }
 
 @end