summaryrefslogtreecommitdiffstats
path: root/views/controls/tree/tree_view.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 23:08:41 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 23:08:41 +0000
commit42c35a5997f5b11522ee308c19d334146ac6895a (patch)
treecb46a30551e8eb5112a6c6ba4d9a9284e2dedcfe /views/controls/tree/tree_view.cc
parenta109d02492863aeb537dea09bfb445eb6f5d94c5 (diff)
downloadchromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.zip
chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.tar.gz
chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.tar.bz2
Reverting 18872.
Broke the Windows build. BUG=None TEST=None TBR=ben Review URL: http://codereview.chromium.org/140023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/tree/tree_view.cc')
-rwxr-xr-xviews/controls/tree/tree_view.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 5a2fb42..95a7210 100755
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -471,11 +471,13 @@ 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()));
- GetFocusManager()->ProcessAccelerator(accelerator);
+ fm->ProcessAccelerator(accelerator);
return true;
}
return false;