diff options
| author | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 18:02:19 +0000 |
|---|---|---|
| committer | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 18:02:19 +0000 |
| commit | 9334af25c26c66e88c5c8c4f82712150b2557271 (patch) | |
| tree | 76014fba47d387f72477cf0f965c5f4df5046a53 /chrome/browser | |
| parent | ae849ea693102dd66d5f01d9ad6799e0bde070d0 (diff) | |
| download | chromium_src-9334af25c26c66e88c5c8c4f82712150b2557271.zip chromium_src-9334af25c26c66e88c5c8c4f82712150b2557271.tar.gz chromium_src-9334af25c26c66e88c5c8c4f82712150b2557271.tar.bz2 | |
Finish refactoring BrowserAccessibility.
TBR=ctguil@chromium.org.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
4 files changed, 5 insertions, 9 deletions
diff --git a/chrome/browser/accessibility/browser_accessibility_cocoa.h b/chrome/browser/accessibility/browser_accessibility_cocoa.h index 170c713..b6b32e0 100644 --- a/chrome/browser/accessibility/browser_accessibility_cocoa.h +++ b/chrome/browser/accessibility/browser_accessibility_cocoa.h @@ -29,8 +29,6 @@ - (id)initWithObject:(BrowserAccessibility*)accessibility delegate:(id<BrowserAccessibilityDelegateCocoa>)delegate; -// Backing source of accessibility info. -@property(nonatomic, assign) BrowserAccessibility* browserAccessibility; // Children is an array of BrowserAccessibility objects, representing // the accessibility children of this object. @property(nonatomic, readonly) NSArray* children; diff --git a/chrome/browser/accessibility/browser_accessibility_cocoa.mm b/chrome/browser/accessibility/browser_accessibility_cocoa.mm index 0a52a05..ebfbf2c 100644 --- a/chrome/browser/accessibility/browser_accessibility_cocoa.mm +++ b/chrome/browser/accessibility/browser_accessibility_cocoa.mm @@ -65,8 +65,6 @@ bool GetState(BrowserAccessibility* accessibility, int state) { @implementation BrowserAccessibilityCocoa -@synthesize browserAccessibility = browserAccessibility_; - - (id)initWithObject:(BrowserAccessibility*)accessibility delegate:(id<BrowserAccessibilityDelegateCocoa>)delegate { if ((self = [super init])) { diff --git a/chrome/browser/accessibility/browser_accessibility_mac.h b/chrome/browser/accessibility/browser_accessibility_mac.h index 1e83fd8..eed09fc 100644 --- a/chrome/browser/accessibility/browser_accessibility_mac.h +++ b/chrome/browser/accessibility/browser_accessibility_mac.h @@ -34,7 +34,8 @@ class BrowserAccessibilityMac : public BrowserAccessibility { // Allows access to the BrowserAccessibilityCocoa which wraps this. // BrowserAccessibility. - // We own this object. + // We own this object until our manager calls ReleaseReference; + // thereafter, the cocoa object owns us. BrowserAccessibilityCocoa* browser_accessibility_cocoa_; DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityMac); }; diff --git a/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm b/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm index 6a6248fc..821b9af 100644 --- a/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm +++ b/chrome/browser/accessibility/browser_accessibility_mac_unittest.mm @@ -72,14 +72,13 @@ class BrowserAccessibilityTest : public CocoaTest { delegate_.reset([[MockAccessibilityDelegate alloc] init]); manager_.reset( BrowserAccessibilityManager::Create(delegate_, root, NULL)); - // The manager still owns this object. - accessibility_ = manager_->GetRoot()->toBrowserAccessibilityCocoa(); + accessibility_.reset([manager_->GetRoot()->toBrowserAccessibilityCocoa() + retain]); } protected: scoped_nsobject<MockAccessibilityDelegate> delegate_; - // We do not own this object. - BrowserAccessibilityCocoa* accessibility_; + scoped_nsobject<BrowserAccessibilityCocoa> accessibility_; scoped_ptr<BrowserAccessibilityManager> manager_; }; |