diff options
author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 17:09:50 +0000 |
---|---|---|
committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 17:09:50 +0000 |
commit | 0174f34a029bddd6ed4de54c7a8d3ff248a4edad (patch) | |
tree | 0c4c61183b18b7286dbf7c5efff70024aea76a3a /chrome | |
parent | fd362c138f65673872b572220aec6b15b09caada (diff) | |
download | chromium_src-0174f34a029bddd6ed4de54c7a8d3ff248a4edad.zip chromium_src-0174f34a029bddd6ed4de54c7a8d3ff248a4edad.tar.gz chromium_src-0174f34a029bddd6ed4de54c7a8d3ff248a4edad.tar.bz2 |
Clean up property name and add comment about thread-safety.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/456022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/cocoa/tab_strip_controller.mm | 2 | ||||
-rw-r--r-- | chrome/browser/cocoa/tab_view.h | 4 | ||||
-rw-r--r-- | chrome/browser/cocoa/tab_view.mm | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm index 51bc6b4..08dd8d7 100644 --- a/chrome/browser/cocoa/tab_strip_controller.mm +++ b/chrome/browser/cocoa/tab_strip_controller.mm @@ -968,7 +968,7 @@ private: // Mark the tab as closing. This prevents it from generating any drags or // selections while it's animating closed. - [(TabView*)[closingTab view] setIsClosing:YES]; + [(TabView*)[closingTab view] setClosing:YES]; // Register delegate (owned by the animation system). NSView* tabView = [closingTab view]; diff --git a/chrome/browser/cocoa/tab_view.h b/chrome/browser/cocoa/tab_view.h index 53670c4..c9a874c 100644 --- a/chrome/browser/cocoa/tab_view.h +++ b/chrome/browser/cocoa/tab_view.h @@ -22,7 +22,7 @@ // TODO(rohitrao): Add this button to a CoreAnimation layer so we can fade it // in and out on mouseovers. IBOutlet NSButton* closeButton_; - BOOL isClosing_; + BOOL closing_; // Tracking area for close button mouseover images. scoped_nsobject<NSTrackingArea> closeTrackingArea_; @@ -64,7 +64,7 @@ // be visible on-screen, but should not respond to/initiate any events. Upon // setting to NO, clears the target/action of the close button to prevent // clicks inside it from sending messages. -@property(assign, nonatomic) BOOL isClosing; +@property(assign, nonatomic, getter=isClosing) BOOL closing; // Enables/Disables tracking regions for the tab. - (void)setTrackingEnabled:(BOOL)enabled; diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm index 20193ac..9330ce3 100644 --- a/chrome/browser/cocoa/tab_view.mm +++ b/chrome/browser/cocoa/tab_view.mm @@ -32,7 +32,7 @@ const CGFloat kRapidCloseDist = 2.5; @synthesize state = state_; @synthesize hoverAlpha = hoverAlpha_; -@synthesize isClosing = isClosing_; +@synthesize closing = closing_; - (id)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; @@ -812,8 +812,8 @@ const CGFloat kRapidCloseDist = 2.5; } } -- (void)setIsClosing:(BOOL)closing { - isClosing_ = closing; +- (void)setClosing:(BOOL)closing { + closing_ = closing; // Safe because the property is nonatomic. // When closing, ensure clicks to the close button go nowhere. if (closing) { [closeButton_ setTarget:nil]; |