diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 18:54:50 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 18:54:50 +0000 |
| commit | 0aaa52814089919103ffa3fee8081e5124c63875 (patch) | |
| tree | 4b43ac8931e6beae4d5122803ed8724517e8e07c /views/accessibility | |
| parent | f4d92d437ea14ea3a02e95ec837dc6872ca6b183 (diff) | |
| download | chromium_src-0aaa52814089919103ffa3fee8081e5124c63875.zip chromium_src-0aaa52814089919103ffa3fee8081e5124c63875.tar.gz chromium_src-0aaa52814089919103ffa3fee8081e5124c63875.tar.bz2 | |
Convert View::HasFocus() to be const. Required adding const versions of some accessors which in turn prompted me to make some uses of these accessors be a bit more const-correct.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8393024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accessibility')
| -rw-r--r-- | views/accessibility/native_view_accessibility_win.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/views/accessibility/native_view_accessibility_win.cc b/views/accessibility/native_view_accessibility_win.cc index d9cdaac..4342517 100644 --- a/views/accessibility/native_view_accessibility_win.cc +++ b/views/accessibility/native_view_accessibility_win.cc @@ -299,10 +299,8 @@ STDMETHODIMP NativeViewAccessibilityWin::get_accFocus(VARIANT* focus_child) { if (!view_) return E_FAIL; - views::View* focus = NULL; views::FocusManager* focus_manager = view_->GetFocusManager(); - if (focus_manager) - focus = focus_manager->GetFocusedView(); + views::View* focus = focus_manager ? focus_manager->GetFocusedView() : NULL; if (focus == view_) { // This view has focus. focus_child->vt = VT_I4; |