diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 14:23:40 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 14:23:40 +0000 |
| commit | c73a3176ade68c2c873b280a0838fcc393a00e56 (patch) | |
| tree | efb0f01636bd0762a3a3a367a823071f7631eeb1 /ui/views/focus | |
| parent | a39ff824c4fcc5b9d57dc627b9adf1d2b7c38a59 (diff) | |
| download | chromium_src-c73a3176ade68c2c873b280a0838fcc393a00e56.zip chromium_src-c73a3176ade68c2c873b280a0838fcc393a00e56.tar.gz chromium_src-c73a3176ade68c2c873b280a0838fcc393a00e56.tar.bz2 | |
views: Rename IsFocusableInRootView() to just IsFocusable().
BUG=105879
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8996009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/focus')
| -rw-r--r-- | ui/views/focus/focus_manager.cc | 3 | ||||
| -rw-r--r-- | ui/views/focus/focus_search.cc | 2 | ||||
| -rw-r--r-- | ui/views/focus/focus_search.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index ca2a55f..b1db57b 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc @@ -297,8 +297,7 @@ void FocusManager::RestoreFocusedView() { View* view = view_storage->RetrieveView(stored_focused_view_storage_id_); if (view) { if (ContainsView(view)) { - if (!view->IsFocusableInRootView() && - view->IsAccessibilityFocusableInRootView()) { + if (!view->IsFocusable() && view->IsAccessibilityFocusableInRootView()) { // RequestFocus would fail, but we want to restore focus to controls // that had focus in accessibility mode. SetFocusedViewWithReason(view, kReasonFocusRestore); diff --git a/ui/views/focus/focus_search.cc b/ui/views/focus/focus_search.cc index 56ec02f..f6b3e96 100644 --- a/ui/views/focus/focus_search.cc +++ b/ui/views/focus/focus_search.cc @@ -102,7 +102,7 @@ bool FocusSearch::IsFocusable(View* v) { if (accessibility_mode_) return v && v->IsAccessibilityFocusableInRootView(); - return v && v->IsFocusableInRootView(); + return v && v->IsFocusable(); } View* FocusSearch::FindSelectedViewForGroup(View* view) { diff --git a/ui/views/focus/focus_search.h b/ui/views/focus/focus_search.h index 50ba6f8..508111b5 100644 --- a/ui/views/focus/focus_search.h +++ b/ui/views/focus/focus_search.h @@ -36,7 +36,7 @@ class VIEWS_EXPORT FocusSearch { // out, even if it's the same view. // - |accessibility_mode| should be true if full keyboard accessibility is // needed and you want to check IsAccessibilityFocusableInRootView(), - // rather than IsFocusableInRootView(). + // rather than IsFocusable(). FocusSearch(View* root, bool cycle, bool accessibility_mode); virtual ~FocusSearch() {} |