diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 03:55:47 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 03:55:47 +0000 |
| commit | 542bdfe5dde965d920bfca1328d0f6e70e8dbb9b (patch) | |
| tree | 69f191ddc519eef4fd2ad6c0fae3fc3e3f9f780e /chrome/browser/cocoa/constrained_window_mac.h | |
| parent | 4e212c3b271b13d22156945997443d00feed6e02 (diff) | |
| download | chromium_src-542bdfe5dde965d920bfca1328d0f6e70e8dbb9b.zip chromium_src-542bdfe5dde965d920bfca1328d0f6e70e8dbb9b.tar.gz chromium_src-542bdfe5dde965d920bfca1328d0f6e70e8dbb9b.tar.bz2 | |
Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5139006
TBR=thestig@chromium.org
Review URL: http://codereview.chromium.org/5270010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67674 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/constrained_window_mac.h')
| -rw-r--r-- | chrome/browser/cocoa/constrained_window_mac.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/constrained_window_mac.h b/chrome/browser/cocoa/constrained_window_mac.h index 42d27e7..321f9c7b 100644 --- a/chrome/browser/cocoa/constrained_window_mac.h +++ b/chrome/browser/cocoa/constrained_window_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -11,6 +11,7 @@ #include "chrome/browser/tab_contents/constrained_window.h" #include "base/basictypes.h" +#include "base/logging.h" #include "base/scoped_nsobject.h" @class BrowserWindowController; @@ -94,7 +95,15 @@ class ConstrainedWindowMacDelegateCustomSheet protected: // For when you need to delay initalization after the constructor call. - void init(NSWindow* sheet, id delegate, SEL didEndSelector); + 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]); } NSWindow* sheet() { return customSheet_; } @@ -153,3 +162,4 @@ class ConstrainedWindowMac : public ConstrainedWindow { }; #endif // CHROME_BROWSER_COCOA_CONSTRAINED_WINDOW_MAC_H_ + |