Views Bubble API adjustments and cleanup

views/window/client_view.cc

Index: views/window/client_view.cc
diff --git a/views/window/client_view.cc b/views/window/client_view.cc
index ef65a2149a984a216ff02803ab1a8134811a1673..5b0d0065ef56139d33812b3270eec6c248c3a56f 100644
--- a/views/window/client_view.cc
+++ b/views/window/client_view.cc
@@ -74,14 +74,8 @@ std::string ClientView::GetClassName() const {
   return kViewClassName;
 }
 
-void ClientView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
-  if (is_add && child == this) {
-    DCHECK(GetWidget());
-    DCHECK(contents_view_); // |contents_view_| must be valid now!
-    // Insert |contents_view_| at index 0 so it is first in the focus chain.
-    // (the OK/Cancel buttons are inserted before contents_view_)
-    AddChildViewAt(contents_view_, 0);
-  }
+void ClientView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_CLIENT;
 }
 
 void ClientView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
@@ -90,8 +84,14 @@ void ClientView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // NonClientView::Layout.
 }
 
-void ClientView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_CLIENT;
+void ClientView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
+  if (is_add && child == this) {
+    DCHECK(GetWidget());
+    DCHECK(contents_view_); // |contents_view_| must be valid now!
+    // Insert |contents_view_| at index 0 so it is first in the focus chain.
+    // (the OK/Cancel buttons are inserted before contents_view_)
+    AddChildViewAt(contents_view_, 0);
+  }
 }
 
 }  // namespace views