Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Unified Diff: chrome/browser/cocoa/constrained_window_mac.h

Issue 5270010: Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/external_metrics.h ('k') | chrome/browser/cocoa/constrained_window_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/constrained_window_mac.h
===================================================================
--- chrome/browser/cocoa/constrained_window_mac.h (revision 67673)
+++ chrome/browser/cocoa/constrained_window_mac.h (working copy)
@@ -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 @@
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 @@
};
#endif // CHROME_BROWSER_COCOA_CONSTRAINED_WINDOW_MAC_H_
+
« no previous file with comments | « chrome/browser/chromeos/external_metrics.h ('k') | chrome/browser/cocoa/constrained_window_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698