| Index: views/focus/focus_search.cc
|
| ===================================================================
|
| --- views/focus/focus_search.cc (revision 86083)
|
| +++ views/focus/focus_search.cc (working copy)
|
| @@ -33,7 +33,7 @@
|
| 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
|
| @@ -97,7 +97,7 @@
|
| 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) {
|
| @@ -109,10 +109,10 @@
|
|
|
| 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;
|
|
|
|
|