Out of line cleanups for Mac.

chrome/browser/ui/cocoa/constrained_window_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_CONSTRAINED_WINDOW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_CONSTRAINED_WINDOW_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
 #include "chrome/browser/tab_contents/constrained_window.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/scoped_nsobject.h"
 
 @class BrowserWindowController;
 @class GTMWindowSheetController;
 @class NSView;
 @class NSWindow;
 class TabContents;
 
 // Base class for constrained dialog delegates. Never inherit from this
 // directly.
 class ConstrainedWindowMacDelegate {
  public:
-  ConstrainedWindowMacDelegate() : is_sheet_open_(false) { }
-  virtual ~ConstrainedWindowMacDelegate();
+  ConstrainedWindowMacDelegate() : is_sheet_open_(false) {}
+  virtual ~ConstrainedWindowMacDelegate() {}
 
   // Tells the delegate to either delete itself or set up a task to delete
   // itself later. Note that you MUST close the sheet belonging to your delegate
   // in this method.
   virtual void DeleteDelegate() = 0;
 
   // Called by the tab controller, you do not need to do anything yourself
   // with this method.
   virtual void RunSheet(GTMWindowSheetController* sheetController,
                         NSView* view) = 0;
  protected:
   // Returns true if this delegate's sheet is currently showing.
   bool is_sheet_open() { return is_sheet_open_; }
 
  private:
   bool is_sheet_open_;
   void set_sheet_open(bool is_open) { is_sheet_open_ = is_open; }
   friend class ConstrainedWindowMac;
 };
 
 // Subclass this for a dialog delegate that displays a system sheet such as
 // an NSAlert, an open or save file panel, etc.
 class ConstrainedWindowMacDelegateSystemSheet
     : public ConstrainedWindowMacDelegate {
  public:
-  ConstrainedWindowMacDelegateSystemSheet(id delegate, SEL didEndSelector)
-    : systemSheet_(nil),
-      delegate_([delegate retain]),
-      didEndSelector_(didEndSelector) { }
+  ConstrainedWindowMacDelegateSystemSheet(id delegate, SEL didEndSelector);
+  virtual ~ConstrainedWindowMacDelegateSystemSheet();
 
  protected:
-  void set_sheet(id sheet) { systemSheet_.reset([sheet retain]); }
+  void set_sheet(id sheet);
   id sheet() { return systemSheet_; }
 
   // Returns an NSArray to be passed as parameters to GTMWindowSheetController.
   // Array's contents should be the arguments passed to the system sheet's
   // beginSheetForWindow:... method. The window argument must be [NSNull null].
   //
   // The default implementation returns
   //     [null window, delegate, didEndSelector, null contextInfo]
   // Subclasses may override this if they show a system sheet which takes
   // different parameters.
   virtual NSArray* GetSheetParameters(id delegate, SEL didEndSelector);
 
  private:
   virtual void RunSheet(GTMWindowSheetController* sheetController,
                         NSView* view);
   scoped_nsobject<id> systemSheet_;
   scoped_nsobject<id> delegate_;
   SEL didEndSelector_;
 };
 
 // Subclass this for a dialog delegate that displays a custom sheet, e.g. loaded
 // from a nib file.
 class ConstrainedWindowMacDelegateCustomSheet
     : public ConstrainedWindowMacDelegate {
  public:
-  ConstrainedWindowMacDelegateCustomSheet()
-    : customSheet_(nil),
-      delegate_(nil),
-      didEndSelector_(NULL) { }
-
-  ConstrainedWindowMacDelegateCustomSheet(id delegate, SEL didEndSelector)
-    : customSheet_(nil),
-      delegate_([delegate retain]),
-      didEndSelector_(didEndSelector) { }
+  ConstrainedWindowMacDelegateCustomSheet();
+  ConstrainedWindowMacDelegateCustomSheet(id delegate, SEL didEndSelector);
+  ~ConstrainedWindowMacDelegateCustomSheet();
 
  protected:
   // For when you need to delay initalization after the constructor call.
-  void init(NSWindow* sheet, id delegate, SEL didEndSelector) {
-    DCHECK(!delegate_.get());
-    DCHECK(!didEndSelector_);
-    customSheet_.reset([sheet retain]);
-    delegate_.reset([delegate retain]);
-    didEndSelector_ = didEndSelector;
-    DCHECK(delegate_.get());
-    DCHECK(didEndSelector_);
-  }
-  void set_sheet(NSWindow* sheet) { customSheet_.reset([sheet retain]); }
+  void init(NSWindow* sheet, id delegate, SEL didEndSelector);
+  void set_sheet(NSWindow* sheet);
   NSWindow* sheet() { return customSheet_; }
 
  private:
   virtual void RunSheet(GTMWindowSheetController* sheetController,
                         NSView* view);
   scoped_nsobject<NSWindow> customSheet_;
   scoped_nsobject<id> delegate_;
   SEL didEndSelector_;
 };
 
@@ skipping 38 matching lines @@
   BrowserWindowController* controller_;
 
   // Stores if |ShowConstrainedWindow()| was called.
   bool should_be_visible_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_CONSTRAINED_WINDOW_MAC_H_