Fixes crash in BrowserAccessibilityManager destructor (see CPBrowsingContextManager for example of this type of fix).
Also fixes small style issue, to be consistent with other Singleton implementations.
Review URL: http://codereview.chromium.org/6282
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3078 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/browser_accessibility_manager.h b/chrome/browser/browser_accessibility_manager.h
index 1ac25e4..4d837bf 100644
--- a/chrome/browser/browser_accessibility_manager.h
+++ b/chrome/browser/browser_accessibility_manager.h
@@ -47,7 +47,7 @@
// Gets the singleton BrowserAccessibilityManager object. The first time this
// method is called, a CacheManagerHost object is constructed and returned.
// Subsequent calls will return the same object.
- static BrowserAccessibilityManager* Instance();
+ static BrowserAccessibilityManager* GetInstance();
// Creates an instance of BrowserAccessibility, initializes it and sets the
// iaccessible_id and parent_id.
@@ -86,7 +86,7 @@
protected:
// This class is a singleton. Do not instantiate directly.
BrowserAccessibilityManager();
- friend DefaultSingletonTraits<BrowserAccessibilityManager>;
+ friend struct DefaultSingletonTraits<BrowserAccessibilityManager>;
~BrowserAccessibilityManager();