Views Bubble API adjustments and cleanup

views/window/client_view.cc

 // Copyright (c) 2011 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 "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/window/client_view.h"
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
 #endif
@@ skipping 56 matching lines @@
   // |contents_view_| is allowed to be NULL up until the point where this view
   // is attached to a Container.
   if (contents_view_)
     contents_view_->SetBounds(0, 0, width(), height());
 }
 
 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) {
   // Overridden to do nothing. The NonClientView manually calls Layout on the
   // ClientView when it is itself laid out, see comment in
   // 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