1 files changed, 33 insertions, 27 deletions

diff --git a/chrome/views/accessibility/view_accessibility.h b/chrome/views/accessibility/view_accessibility.h
index c94054f..c541a04 100644
--- a/chrome/views/accessibility/view_accessibility.h
+++ b/chrome/views/accessibility/view_accessibility.h
@@ -37,45 +37,48 @@ class ATL_NO_VTABLE ViewAccessibility
 
   // Supported IAccessible methods.
 
-  // Retrieves the number of accessible children.
-  STDMETHODIMP get_accChildCount(LONG* child_count);
+  // Retrieves the child element or child object at a given point on the screen.
+  STDMETHODIMP accHitTest(LONG x_left, LONG y_top, VARIANT* child);
+
+  // Retrieves the specified object's current screen location.
+  STDMETHODIMP accLocation(LONG* x_left,
+                           LONG* y_top,
+                           LONG* width,
+                           LONG* height,
+                           VARIANT var_id);
+
+  // Traverses to another UI element and retrieves the object.
+  STDMETHODIMP accNavigate(LONG nav_dir, VARIANT start, VARIANT* end);
 
   // Retrieves an IDispatch interface pointer for the specified child.
   STDMETHODIMP get_accChild(VARIANT var_child, IDispatch** disp_child);
 
-  // Retrieves the IDispatch interface of the object's parent.
-  STDMETHODIMP get_accParent(IDispatch** disp_parent);
+  // Retrieves the number of accessible children.
+  STDMETHODIMP get_accChildCount(LONG* child_count);
 
-  // Traverses to another UI element and retrieves the object.
-  STDMETHODIMP accNavigate(LONG nav_dir, VARIANT start, VARIANT* end);
+  // Retrieves a string that describes the object's default action.
+  STDMETHODIMP get_accDefaultAction(VARIANT var_id, BSTR* default_action);
+
+  // Retrieves the tooltip description.
+  STDMETHODIMP get_accDescription(VARIANT var_id, BSTR* desc);
 
   // Retrieves the object that has the keyboard focus.
   STDMETHODIMP get_accFocus(VARIANT* focus_child);
 
+  // Retrieves the specified object's shortcut.
+  STDMETHODIMP get_accKeyboardShortcut(VARIANT var_id, BSTR* access_key);
+
   // Retrieves the name of the specified object.
   STDMETHODIMP get_accName(VARIANT var_id, BSTR* name);
 
-  // Retrieves the tooltip description.
-  STDMETHODIMP get_accDescription(VARIANT var_id, BSTR* desc);
-
-  // Retrieves the current state of the specified object.
-  STDMETHODIMP get_accState(VARIANT var_id, VARIANT* state);
+  // Retrieves the IDispatch interface of the object's parent.
+  STDMETHODIMP get_accParent(IDispatch** disp_parent);
 
   // Retrieves information describing the role of the specified object.
   STDMETHODIMP get_accRole(VARIANT var_id, VARIANT* role);
 
-  // Retrieves a string that describes the object's default action.
-  STDMETHODIMP get_accDefaultAction(VARIANT var_id, BSTR* default_action);
-
-  // Retrieves the specified object's current screen location.
-  STDMETHODIMP accLocation(LONG* x_left, LONG* y_top, LONG* width, LONG* height,
-                           VARIANT var_id);
-
-  // Retrieves the child element or child object at a given point on the screen.
-  STDMETHODIMP accHitTest(LONG x_left, LONG y_top, VARIANT* child);
-
-  // Retrieves the specified object's shortcut.
-  STDMETHODIMP get_accKeyboardShortcut(VARIANT var_id, BSTR* access_key);
+  // Retrieves the current state of the specified object.
+  STDMETHODIMP get_accState(VARIANT var_id, VARIANT* state);
 
   // Non-supported IAccessible methods.
 
@@ -91,7 +94,8 @@ class ATL_NO_VTABLE ViewAccessibility
 
   // Help functions not supported.
   STDMETHODIMP get_accHelp(VARIANT var_id, BSTR* help);
-  STDMETHODIMP get_accHelpTopic(BSTR* help_file, VARIANT var_id,
+  STDMETHODIMP get_accHelpTopic(BSTR* help_file,
+                                VARIANT var_id,
                                 LONG* topic_id);
 
   // Deprecated functions, not implemented here.
@@ -110,12 +114,14 @@ class ATL_NO_VTABLE ViewAccessibility
 
   // Determines if the navigation target is within the allowed bounds. Returns
   // true if it is, false otherwise.
-  bool IsValidNav(int nav_dir, int start_id, int lower_bound,
+  bool IsValidNav(int nav_dir,
+                  int start_id,
+                  int lower_bound,
                   int upper_bound) const;
 
   // Wrapper to retrieve the view's instance of IAccessible.
-  AccessibleWrapper* GetAccessibleWrapper(views::View* view) const {
-    return view->GetAccessibleWrapper();
+  ViewAccessibilityWrapper* GetViewAccessibilityWrapper(views::View* v) const {
+    return v->GetViewAccessibilityWrapper();
   }
 
   // Helper function which sets applicable states of view.