Mac: Save/restore task manager window pos and size.

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/singleton.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"
+#import "chrome/browser/cocoa/window_size_autosaver.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 "skia/ext/skia_utils_mac.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 @interface KeywordEditorCocoaController (Private)
 - (void)adjustEditingButtons;
@@ skipping 113 matching lines @@
   NSString* nibpath = [mac_util::MainAppBundle()
                         pathForResource:@"KeywordEditor"
                                  ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     profile_ = profile;
     controller_.reset(new KeywordEditorController(profile_));
     observer_.reset(new KeywordEditorModelObserver(self));
     controller_->table_model()->SetObserver(observer_.get());
     controller_->url_model()->AddObserver(observer_.get());
     groupCell_.reset([[NSTextFieldCell alloc] init]);
+
+    if (g_browser_process && g_browser_process->local_state()) {
+      sizeSaver_.reset([[WindowSizeAutosaver alloc]
+          initWithWindow:[self window]
+             prefService:g_browser_process->local_state()
+                    path:prefs::kKeywordEditorWindowPlacement
+                   state:kSaveWindowRect]);
+    }
   }
   return self;
 }
 
 - (void)dealloc {
   controller_->table_model()->SetObserver(NULL);
   controller_->url_model()->RemoveObserver(observer_.get());
   [tableView_ setDataSource:nil];
   observer_.reset();
   [super dealloc];
 }
 
 - (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];
 
   ProfileControllerMap* map = Singleton<ProfileControllerMap>::get();
   ProfileControllerMap::iterator it = map->find(profile_);
   // It should not be possible for this to be missing.
   // TODO(shess): Except that the unit test reaches in directly.
   // Consider circling around and refactoring that.
   //DCHECK(it != map->end());
   if (it != map->end()) {
     map->erase(it);
   }
 }
 
-// Remeber the position of the keyword editor.
-- (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];
   [self adjustEditingButtons];
 }
 
 - (KeywordEditorController*)controller {
   return controller_.get();
 }
 
 - (void)sheetDidEnd:(NSWindow*)sheet
@@ skipping 190 matching lines @@
       controller_->table_model()->last_search_engine_index() + 1;
   DCHECK_NE(row, otherGroupId);
   if (row >= otherGroupId) {
     return row - 2;  // Other group.
   } else {
     return row - 1;  // Default group.
   }
 }
 
 @end