[Mac] Polish the search engine manager

chrome/browser/cocoa/keyword_editor_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 <Cocoa/Cocoa.h>
 
 #import "base/mac_util.h"
 #include "base/sys_string_conversions.h"
+#include "chrome/browser/browser_process.h"
 #import "chrome/browser/cocoa/edit_search_engine_cocoa_controller.h"
+#import "chrome/browser/cocoa/nswindow_local_state.h"
 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_table_model.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 @interface KeywordEditorCocoaController (Private)
 - (void)adjustEditingButtons;
 - (void)editKeyword:(id)sender;
 @end
 
 // KeywordEditorModelObserver -------------------------------------------------
 
@@ skipping 46 matching lines @@
 }
 
 - (void)awakeFromNib {
   // Make sure the button fits its label, but keep it the same height as the
   // other two buttons.
   [GTMUILocalizerAndLayoutTweaker sizeToFitView:makeDefaultButton_];
   NSSize size = [makeDefaultButton_ frame].size;
   size.height = NSHeight([addButton_ frame]);
   [makeDefaultButton_ setFrameSize:size];
 
+  // Restore the window position.
+  if (g_browser_process && g_browser_process->local_state()) {
+    PrefService* prefs = g_browser_process->local_state();
+    NSWindow* window = [self window];
+    [window restoreWindowPositionFromPrefs:prefs
+                                withPath:prefs::kKeywordEditorWindowPlacement];
+  }
+
   [self adjustEditingButtons];
   [tableView_ setDoubleAction:@selector(editKeyword:)];
   [tableView_ setTarget:self];
 }
 
 // When the window closes, clean ourselves up.
 - (void)windowWillClose:(NSNotification*)notif {
   [self autorelease];
 }
 
+// The last page info window that was moved will determine the location of the
+// next new one.
+- (void)windowDidMove:(NSNotification*)notif {
+  if (g_browser_process && g_browser_process->local_state()) {
+    NSWindow* window = [self window];
+    [window saveWindowPositionToPrefs:g_browser_process->local_state()
+                             withPath:prefs::kKeywordEditorWindowPlacement];
+  }
+}
+
 - (void)modelChanged {
   [tableView_ reloadData];
 }
 
 - (KeywordEditorController*)controller {
   return controller_.get();
 }
 
+- (void)sheetDidEnd:(NSWindow*)sheet
+         returnCode:(NSInteger)code
+            context:(void*)context {
+  [sheet orderOut:self];
+}
+
 - (IBAction)addKeyword:(id)sender {
   // The controller will release itself when the window closes.
   EditSearchEngineCocoaController* editor =
       [[EditSearchEngineCocoaController alloc] initWithProfile:profile_
                                                       delegate:observer_.get()
                                                    templateURL:NULL];
-  [[editor window] makeKeyAndOrderFront:self];
+  [NSApp beginSheet:[editor window]
+     modalForWindow:[self window]
+      modalDelegate:self
+     didEndSelector:@selector(sheetDidEnd:returnCode:context:)
+        contextInfo:NULL];
 }
 
 - (void)editKeyword:(id)sender {
   const NSInteger clickedRow = [tableView_ clickedRow];
   if (clickedRow == -1)
     return;
   const TemplateURL* url = controller_->GetTemplateURL(clickedRow);
   // The controller will release itself when the window closes.
   EditSearchEngineCocoaController* editor =
       [[EditSearchEngineCocoaController alloc] initWithProfile:profile_
                                                       delegate:observer_.get()
                                                    templateURL:url];
-  [[editor window] makeKeyAndOrderFront:self];
+  [NSApp beginSheet:[editor window]
+     modalForWindow:[self window]
+      modalDelegate:self
+     didEndSelector:@selector(sheetDidEnd:returnCode:context:)
+        contextInfo:NULL];
 }
 
 - (IBAction)deleteKeyword:(id)sender {
   NSIndexSet* selection = [tableView_ selectedRowIndexes];
   DCHECK_GT([selection count], 0U);
   NSUInteger index = [selection lastIndex];
   while (index != NSNotFound) {
     controller_->RemoveTemplateURL(index);
     index = [selection indexLessThanIndex:index];
   }
@@ skipping 70 matching lines @@
   if ([selection count] != 1) {
     [makeDefaultButton_ setEnabled:NO];
   } else {
     const TemplateURL& url =
         controller_->table_model()->GetTemplateURL([selection firstIndex]);
     [makeDefaultButton_ setEnabled:controller_->CanMakeDefault(&url)];
   }
 }
 
 @end