MacViews: Exploring removal of window-modal sheets.

chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm

 // Copyright (c) 2012 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/constrained_window/constrained_window_sheet_controller.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/mac/sdk_forward_declarations.h"
@@ skipping 116 matching lines @@
 - (id)initWithParentWindow:(NSWindow*)parentWindow {
   if ((self = [super init])) {
     parentWindow_.reset([parentWindow retain]);
     sheets_.reset([[NSMutableArray alloc] init]);
 
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(onParentWindowWillClose:)
                name:NSWindowWillCloseNotification
              object:parentWindow_];
+
+    // Observe the parent window's size.
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+           selector:@selector(onParentWindowSizeDidChange:)
+               name:NSWindowDidResizeNotification
+             object:parentWindow_];
   }
   return self;
 }
 
 - (web_modal::WebContentsModalDialogHost*)dialogHost {
   if (!dialogHost_)
     dialogHost_.reset(new WebContentsModalDialogHostCocoa(self));
   return dialogHost_.get();
 }
 
@@ skipping 15 matching lines @@
   // |parentView|, so sheet info could be created already.
   ConstrainedWindowSheetInfo* existingInfo =
       [self findSheetInfoForParentView:activeView_];
   if (existingInfo) {
     DCHECK([[existingInfo sheet] isEqual:sheet]);
     [self updateSheetPosition:activeView_];
     [existingInfo showSheet];
     return;
   }
 
-  // Observe the parent window's size.
-  [[NSNotificationCenter defaultCenter]
-      addObserver:self
-         selector:@selector(onParentWindowSizeDidChange:)
-             name:NSWindowDidResizeNotification
-           object:parentWindow_];
-
   // Create an invisible overlay window.
   NSRect rect = [self overlayWindowFrameForParentView:parentView];
   base::scoped_nsobject<NSWindow> overlayWindow(
       [[CWSheetOverlayWindow alloc] initWithContentRect:rect controller:self]);
   [parentWindow_ addChildWindow:overlayWindow
                         ordered:NSWindowAbove];
 
   // Add an entry for the sheet.
   base::scoped_nsobject<ConstrainedWindowSheetInfo> info(
       [[ConstrainedWindowSheetInfo alloc] initWithSheet:sheet
@@ skipping 71 matching lines @@
 - (ConstrainedWindowSheetInfo*)
     findSheetInfoForSheet:(id<ConstrainedWindowSheet>)sheet {
   for (ConstrainedWindowSheetInfo* info in sheets_.get()) {
     if ([sheet isEqual:[info sheet]])
       return info;
   }
   return NULL;
 }
 
 - (void)onParentWindowWillClose:(NSNotification*)note {
-  [[NSNotificationCenter defaultCenter]
-      removeObserver:self
-                name:NSWindowWillCloseNotification
-              object:parentWindow_];
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   // Close all sheets.
   NSArray* sheets = [NSArray arrayWithArray:sheets_];
   for (ConstrainedWindowSheetInfo* info in sheets)
     [self closeSheet:info withAnimation:NO];
 
   dialogHost_.reset();
 
   // Delete this instance.
   [g_sheetControllers removeObjectForKey:GetKeyForParentWindow(parentWindow_)];
   if (![g_sheetControllers count]) {
     [g_sheetControllers release];
     g_sheetControllers = nil;
   }
 }
 
 - (void)onParentWindowSizeDidChange:(NSNotification*)note {
   if (isSheetHiddenForFullscreen_)
     return;
 
   [self updateSheetPosition:activeView_];
+  if (dialogHost_)
+    dialogHost_->OnPositionRequiresUpdate();
 }
 
 - (void)updateSheetPosition:(NSView*)parentView {
   ConstrainedWindowSheetInfo* info =
       [self findSheetInfoForParentView:parentView];
   if (!info)
     return;
 
   NSRect rect = [self overlayWindowFrameForParentView:parentView];
   [[info overlayWindow] setFrame:rect display:YES];
@@ skipping 38 matching lines @@
       break;
     }
   }
 }
 
 - (void)closeSheet:(ConstrainedWindowSheetInfo*)info
      withAnimation:(BOOL)withAnimation {
   if (![sheets_ containsObject:info])
     return;
 
-  [[NSNotificationCenter defaultCenter]
-      removeObserver:self
-                name:NSWindowDidResizeNotification
-              object:parentWindow_];
-
   if ([activeView_ isEqual:[info parentView]])
     activeView_.reset();
 
   [parentWindow_ removeChildWindow:[info overlayWindow]];
   [[info sheet] closeSheetWithAnimation:withAnimation];
   [[info overlayWindow] close];
   [sheets_ removeObject:info];
 }
 
 @end