| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <Carbon/Carbon.h> | 5 #include <Carbon/Carbon.h> |
| 6 | 6 |
| 7 #include "base/mac_util.h" | 7 #include "base/mac_util.h" |
| 8 #include "base/scoped_nsdisable_screen_updates.h" | 8 #include "base/scoped_nsdisable_screen_updates.h" |
| 9 #import "base/scoped_nsobject.h" | 9 #import "base/scoped_nsobject.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 // the window's views were living longer than this controller, and | 264 // the window's views were living longer than this controller, and |
| 265 // were then being re-displayed. Better would be to have it live | 265 // were then being re-displayed. Better would be to have it live |
| 266 // the appropriate amount of time, at which point we can remove | 266 // the appropriate amount of time, at which point we can remove |
| 267 // this. [And perhaps the funky -autorelease below can be fixed.] | 267 // this. [And perhaps the funky -autorelease below can be fixed.] |
| 268 [window_ setAutodisplay:NO]; | 268 [window_ setAutodisplay:NO]; |
| 269 | 269 |
| 270 DCHECK(!browser_->tabstrip_model()->count()); | 270 DCHECK(!browser_->tabstrip_model()->count()); |
| 271 | 271 |
| 272 // We can't actually use |-autorelease| here because there's an embedded | 272 // We can't actually use |-autorelease| here because there's an embedded |
| 273 // run loop in the |-performClose:| which contains its own autorelease pool. | 273 // run loop in the |-performClose:| which contains its own autorelease pool. |
| 274 // Instead we use call it after a zero-length delay, which gets us back | 274 // Instead we call it after a zero-length delay, which gets us back |
| 275 // to the main event loop. | 275 // to the main event loop. |
| 276 [self performSelector:@selector(autorelease) | 276 [self performSelector:@selector(autorelease) |
| 277 withObject:nil | 277 withObject:nil |
| 278 afterDelay:0]; | 278 afterDelay:0]; |
| 279 } | 279 } |
| 280 | 280 |
| 281 - (void)attachConstrainedWindow:(ConstrainedWindowMac*)window { | 281 - (void)attachConstrainedWindow:(ConstrainedWindowMac*)window { |
| 282 [tabStripController_ attachConstrainedWindow:window]; | 282 [tabStripController_ attachConstrainedWindow:window]; |
| 283 } | 283 } |
| 284 | 284 |
| (...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1531 if (frameOverlayInactiveImage) { | 1531 if (frameOverlayInactiveImage) { |
| 1532 [theme setValue:frameOverlayInactiveImage | 1532 [theme setValue:frameOverlayInactiveImage |
| 1533 forAttribute:@"overlay" | 1533 forAttribute:@"overlay" |
| 1534 style:GTMThemeStyleWindow | 1534 style:GTMThemeStyleWindow |
| 1535 state:GTMThemeStateInactiveWindow]; | 1535 state:GTMThemeStateInactiveWindow]; |
| 1536 } | 1536 } |
| 1537 | 1537 |
| 1538 return theme; | 1538 return theme; |
| 1539 } | 1539 } |
| 1540 @end | 1540 @end |
| OLD | NEW |