summaryrefslogtreecommitdiffstats
path: root/views/controls/tree
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-20 04:22:44 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-20 04:22:44 +0000
commit3c3ba740c63a178807cc0c1a563080e0adbfe143 (patch)
tree78bcd84e7870d8009165df0e7a9fca87f4e91903 /views/controls/tree
parent76724d00d3498f952d945d775a3f33f751624121 (diff)
downloadchromium_src-3c3ba740c63a178807cc0c1a563080e0adbfe143.zip
chromium_src-3c3ba740c63a178807cc0c1a563080e0adbfe143.tar.gz
chromium_src-3c3ba740c63a178807cc0c1a563080e0adbfe143.tar.bz2
Relanding focus manager refactoring with build fix, see:http://codereview.chromium.org/125148BUG=NoneTEST=NoneTBR=ben
Review URL: http://codereview.chromium.org/141013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/tree')
-rwxr-xr-xviews/controls/tree/tree_view.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 95a7210..5a2fb42 100755
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -471,13 +471,11 @@ bool TreeView::OnKeyDown(int virtual_key_code) {
} else if (virtual_key_code == VK_RETURN && !process_enter_) {
Widget* widget = GetWidget();
DCHECK(widget);
- FocusManager* fm = FocusManager::GetFocusManager(widget->GetNativeView());
- DCHECK(fm);
Accelerator accelerator(Accelerator(static_cast<int>(virtual_key_code),
win_util::IsShiftPressed(),
win_util::IsCtrlPressed(),
win_util::IsAltPressed()));
- fm->ProcessAccelerator(accelerator);
+ GetFocusManager()->ProcessAccelerator(accelerator);
return true;
}
return false;