mac: Remove one static initializer.

content/browser/accessibility/browser_accessibility_cocoa.mm

 // Copyright (c) 2012 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.
 
 #include <execinfo.h>
 
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include <map>
 
@@ skipping 29 matching lines @@
   return returnValue;
 }
 
 struct MapEntry {
   AccessibilityNodeData::Role webKitValue;
   NSString* nativeValue;
 };
 
 typedef std::map<AccessibilityNodeData::Role, NSString*> RoleMap;
 
-struct AttributeToMethodNameEntry {
-  NSString* attribute;
-  NSString* methodName;
-};
-
-const AttributeToMethodNameEntry attributeToMethodNameContainer[] = {
-  { NSAccessibilityChildrenAttribute, @"children" },
-  { NSAccessibilityColumnsAttribute, @"columns" },
-  { NSAccessibilityDescriptionAttribute, @"description" },
-  { NSAccessibilityEnabledAttribute, @"enabled" },
-  { NSAccessibilityFocusedAttribute, @"focused" },
-  { NSAccessibilityHelpAttribute, @"help" },
-  { NSAccessibilityMaxValueAttribute, @"maxValue" },
-  { NSAccessibilityMinValueAttribute, @"minValue" },
-  { NSAccessibilityNumberOfCharactersAttribute, @"numberOfCharacters" },
-  { NSAccessibilityParentAttribute, @"parent" },
-  { NSAccessibilityPositionAttribute, @"position" },
-  { NSAccessibilityRoleAttribute, @"role" },
-  { NSAccessibilityRoleDescriptionAttribute, @"roleDescription" },
-  { NSAccessibilityRowsAttribute, @"rows" },
-  { NSAccessibilitySizeAttribute, @"size" },
-  { NSAccessibilitySubroleAttribute, @"subrole" },
-  { NSAccessibilityTabsAttribute, @"tabs" },
-  { NSAccessibilityTitleAttribute, @"title" },
-  { NSAccessibilityTitleUIElementAttribute, @"titleUIElement" },
-  { NSAccessibilityTopLevelUIElementAttribute, @"window" },
-  { NSAccessibilityURLAttribute, @"url" },
-  { NSAccessibilityValueAttribute, @"value" },
-  { NSAccessibilityVisibleCharacterRangeAttribute, @"visibleCharacterRange" },
-  { NSAccessibilityWindowAttribute, @"window" },
-  { @"AXAccessKey", @"accessKey" },
-  { @"AXARIAAtomic", @"ariaAtomic" },
-  { @"AXARIABusy", @"ariaBusy" },
-  { @"AXARIALive", @"ariaLive" },
-  { @"AXARIARelevant", @"ariaRelevant" },
-  { @"AXLoaded", @"loaded" },
-  { @"AXLoadingProgress", @"loadingProgress" },
-  { @"AXRequired", @"required" },
-  { @"AXVisited", @"visited" },
-};
-
 // GetState checks the bitmask used in AccessibilityNodeData to check
 // if the given state was set on the accessibility object.
 bool GetState(BrowserAccessibility* accessibility, int state) {
   return ((accessibility->state() >> state) & 1);
 }
 
 RoleMap BuildRoleMap() {
   const MapEntry roles[] = {
     { AccessibilityNodeData::ROLE_ALERT, NSAccessibilityGroupRole },
     { AccessibilityNodeData::ROLE_ALERT_DIALOG, NSAccessibilityGroupRole },
@@ skipping 178 matching lines @@
     return nil;
 }
 
 // A mapping from an accessibility attribute to its method name.
 NSDictionary* attributeToMethodNameMap = nil;
 
 } // namespace
 
 @implementation BrowserAccessibilityCocoa
 
 + (void)initialize {

[Nico, 2012/07/29 06:09:07]

(+initialize methods are effectively static initializers too, but it's still
better to have 1 instead of 2 of those :-) )

+  const struct {
+    NSString* attribute;
+    NSString* methodName;
+  } attributeToMethodNameContainer[] = {
+    { NSAccessibilityChildrenAttribute, @"children" },
+    { NSAccessibilityColumnsAttribute, @"columns" },
+    { NSAccessibilityDescriptionAttribute, @"description" },
+    { NSAccessibilityEnabledAttribute, @"enabled" },
+    { NSAccessibilityFocusedAttribute, @"focused" },
+    { NSAccessibilityHelpAttribute, @"help" },
+    { NSAccessibilityMaxValueAttribute, @"maxValue" },
+    { NSAccessibilityMinValueAttribute, @"minValue" },
+    { NSAccessibilityNumberOfCharactersAttribute, @"numberOfCharacters" },
+    { NSAccessibilityParentAttribute, @"parent" },
+    { NSAccessibilityPositionAttribute, @"position" },
+    { NSAccessibilityRoleAttribute, @"role" },
+    { NSAccessibilityRoleDescriptionAttribute, @"roleDescription" },
+    { NSAccessibilityRowsAttribute, @"rows" },
+    { NSAccessibilitySizeAttribute, @"size" },
+    { NSAccessibilitySubroleAttribute, @"subrole" },
+    { NSAccessibilityTabsAttribute, @"tabs" },
+    { NSAccessibilityTitleAttribute, @"title" },
+    { NSAccessibilityTitleUIElementAttribute, @"titleUIElement" },
+    { NSAccessibilityTopLevelUIElementAttribute, @"window" },
+    { NSAccessibilityURLAttribute, @"url" },
+    { NSAccessibilityValueAttribute, @"value" },
+    { NSAccessibilityVisibleCharacterRangeAttribute, @"visibleCharacterRange" },
+    { NSAccessibilityWindowAttribute, @"window" },
+    { @"AXAccessKey", @"accessKey" },
+    { @"AXARIAAtomic", @"ariaAtomic" },
+    { @"AXARIABusy", @"ariaBusy" },
+    { @"AXARIALive", @"ariaLive" },
+    { @"AXARIARelevant", @"ariaRelevant" },
+    { @"AXLoaded", @"loaded" },
+    { @"AXLoadingProgress", @"loadingProgress" },
+    { @"AXRequired", @"required" },
+    { @"AXVisited", @"visited" },
+  };
+
   NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
   const size_t numAttributes = sizeof(attributeToMethodNameContainer) /
                                sizeof(attributeToMethodNameContainer[0]);
   for (size_t i = 0; i < numAttributes; ++i) {
     [dict setObject:attributeToMethodNameContainer[i].methodName
              forKey:attributeToMethodNameContainer[i].attribute];
   }
   attributeToMethodNameMap = dict;
   dict = nil;
 }
@@ skipping 777 matching lines @@
     return [super hash];
   return browserAccessibility_->renderer_id();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end