Relanding http://codereview.chromium.org/8416034

content/browser/accessibility/browser_accessibility_mac.mm

Index: content/browser/accessibility/browser_accessibility_mac.mm
diff --git a/content/browser/accessibility/browser_accessibility_mac.mm b/content/browser/accessibility/browser_accessibility_mac.mm
index 145294d3af3d39c140f269efc1243082be788eee..7729e5772d552991c080765e00382701436f95d1 100644
--- a/content/browser/accessibility/browser_accessibility_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_mac.mm
@@ -1,59 +1,59 @@
-// Copyright (c) 2010 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.
-
-#import <Cocoa/Cocoa.h>
-
-#import "content/browser/accessibility/browser_accessibility_mac.h"
-
-#import "content/browser/accessibility/browser_accessibility_cocoa.h"
-#import "content/browser/accessibility/browser_accessibility_delegate_mac.h"
-#include "content/browser/accessibility/browser_accessibility_manager.h"
-
-
-// Static.
-BrowserAccessibility* BrowserAccessibility::Create() {
-  return new BrowserAccessibilityMac();
-}
-
-BrowserAccessibilityMac::BrowserAccessibilityMac()
-    : browser_accessibility_cocoa_(NULL) {
-}
-
-void BrowserAccessibilityMac::Initialize() {
-  BrowserAccessibility::Initialize();
-
-  if (browser_accessibility_cocoa_)
-    return;
-
-  // We take ownership of the cocoa obj here.
-  browser_accessibility_cocoa_ = [[BrowserAccessibilityCocoa alloc]
-      initWithObject:this
-      delegate:
-          (id<BrowserAccessibilityDelegateCocoa>)manager_->GetParentView()];
-}
-
-void BrowserAccessibilityMac::NativeReleaseReference() {
-  if (browser_accessibility_cocoa_) {
-    BrowserAccessibilityCocoa* temp = browser_accessibility_cocoa_;
-    browser_accessibility_cocoa_ = nil;
-    // Relinquish ownership of the cocoa obj.
-    [temp release];
-    // At this point, other processes may have a reference to
-    // the cocoa object. When the retain count hits zero, it will
-    // destroy us in dealloc.
-    // For that reason, do *not* make any more calls here after
-    // as we might have been deleted.
-  }
-}
-
-void BrowserAccessibilityMac::DetachTree(
-    std::vector<BrowserAccessibility*>* nodes) {
-  [browser_accessibility_cocoa_ childrenChanged];
-  BrowserAccessibility::DetachTree(nodes);
-}
-
-BrowserAccessibilityCocoa* BrowserAccessibility::toBrowserAccessibilityCocoa() {
-  return static_cast<BrowserAccessibilityMac*>(this)->
-      native_view();
-}
+// Copyright (c) 2010 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.
+
+#import <Cocoa/Cocoa.h>
+
+#import "content/browser/accessibility/browser_accessibility_mac.h"
+
+#import "content/browser/accessibility/browser_accessibility_cocoa.h"
+#import "content/browser/accessibility/browser_accessibility_delegate_mac.h"
+#include "content/browser/accessibility/browser_accessibility_manager.h"
+
+
+// Static.
+BrowserAccessibility* BrowserAccessibility::Create() {
+  return new BrowserAccessibilityMac();
+}
+
+BrowserAccessibilityMac::BrowserAccessibilityMac()
+    : browser_accessibility_cocoa_(NULL) {
+}
+
+void BrowserAccessibilityMac::PreInitialize() {
+  BrowserAccessibility::PreInitialize();
+
+  if (browser_accessibility_cocoa_)
+    return;
+
+  // We take ownership of the cocoa obj here.
+  browser_accessibility_cocoa_ = [[BrowserAccessibilityCocoa alloc]
+      initWithObject:this
+      delegate:
+          (id<BrowserAccessibilityDelegateCocoa>)manager_->GetParentView()];
+}
+
+void BrowserAccessibilityMac::NativeReleaseReference() {
+  if (browser_accessibility_cocoa_) {
+    BrowserAccessibilityCocoa* temp = browser_accessibility_cocoa_;
+    browser_accessibility_cocoa_ = nil;
+    // Relinquish ownership of the cocoa obj.
+    [temp release];
+    // At this point, other processes may have a reference to
+    // the cocoa object. When the retain count hits zero, it will
+    // destroy us in dealloc.
+    // For that reason, do *not* make any more calls here after
+    // as we might have been deleted.
+  }
+}
+
+void BrowserAccessibilityMac::DetachTree(
+    std::vector<BrowserAccessibility*>* nodes) {
+  [browser_accessibility_cocoa_ childrenChanged];
+  BrowserAccessibility::DetachTree(nodes);
+}
+
+BrowserAccessibilityCocoa* BrowserAccessibility::toBrowserAccessibilityCocoa() {
+  return static_cast<BrowserAccessibilityMac*>(this)->
+      native_view();
+}