Variety of tweaks to View API.

views/focus/focus_search.cc

 // Copyright (c) 2010 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 "views/focus/focus_manager.h"
 #include "views/focus/focus_search.h"
 #include "views/view.h"
 
 namespace views {
@@ skipping 15 matching lines @@
 
   if (!root_->has_children()) {
     NOTREACHED();
     // Nothing to focus on here.
     return NULL;
   }
 
   View* initial_starting_view = starting_view;
   int starting_view_group = -1;
   if (starting_view)
-    starting_view_group = starting_view->GetGroup();
+    starting_view_group = starting_view->group();
 
   if (!starting_view) {
     // Default to the first/last child
     starting_view =
         reverse ?
         root_->GetChildViewAt(root_->child_count() - 1) :
         root_->GetChildViewAt(0);
     // If there was no starting view, then the one we select is a potential
     // focus candidate.
     check_starting_view = true;
@@ skipping 43 matching lines @@
     DCHECK(*focus_traversable_view);
     return NULL;
   }
   // Nothing found.
   return NULL;
 }
 
 bool FocusSearch::IsViewFocusableCandidate(View* v, int skip_group_id) {
   return IsFocusable(v) &&
       (v->IsGroupFocusTraversable() || skip_group_id == -1 ||
-       v->GetGroup() != skip_group_id);
+       v->group() != skip_group_id);
 }
 
 bool FocusSearch::IsFocusable(View* v) {
   if (accessibility_mode_)
     return v && v->IsAccessibilityFocusableInRootView();
 
   return v && v->IsFocusableInRootView();
 }
 
 View* FocusSearch::FindSelectedViewForGroup(View* view) {
   if (view->IsGroupFocusTraversable() ||
-      view->GetGroup() == -1)  // No group for that view.
+      view->group() == -1)  // No group for that view.
     return view;
 
-  View* selected_view = view->GetSelectedViewForGroup(view->GetGroup());
+  View* selected_view = view->GetSelectedViewForGroup(view->group());
   if (selected_view)
     return selected_view;
 
   // No view selected for that group, default to the specified view.
   return view;
 }
 
 View* FocusSearch::GetParent(View* v) {
   return root_->Contains(v) ? v->parent() : NULL;
 }
@@ skipping 139 matching lines @@
                                            skip_group_id,
                                            focus_traversable,
                                            focus_traversable_view);
   }
 
   // We found nothing.
   return NULL;
 }
 
 }  // namespace views