summaryrefslogtreecommitdiffstats
path: root/ash/focus_cycler.cc
diff options
context:
space:
mode:
authorskuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 06:12:52 +0000
committerskuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 06:12:52 +0000
commite846c006edf7e38ee103b4962346b31bd4a6d4e9 (patch)
treeca20dfc302e1782033371ecd747b48e57c4c73fb /ash/focus_cycler.cc
parentbd8f606940b8e709388c5470ad8c1806033659d6 (diff)
downloadchromium_src-e846c006edf7e38ee103b4962346b31bd4a6d4e9.zip
chromium_src-e846c006edf7e38ee103b4962346b31bd4a6d4e9.tar.gz
chromium_src-e846c006edf7e38ee103b4962346b31bd4a6d4e9.tar.bz2
Fixing activation state problem with the launcher acessiblity pane
BUG=165089 TEST=unittest Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183728 Review URL: https://chromiumcodereview.appspot.com/12315021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/focus_cycler.cc')
-rw-r--r--ash/focus_cycler.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc
index 801cd35..80ef432 100644
--- a/ash/focus_cycler.cc
+++ b/ash/focus_cycler.cc
@@ -76,16 +76,12 @@ void FocusCycler::RotateFocus(Direction direction) {
}
bool FocusCycler::FocusWidget(views::Widget* widget) {
- views::AccessiblePaneView* view =
- static_cast<views::AccessiblePaneView*>(widget->GetContentsView());
- if (view->SetPaneFocusAndFocusDefault()) {
- widget_activating_ = widget;
- widget->Activate();
- widget_activating_ = NULL;
- if (widget->IsActive())
- return true;
- }
- return false;
+ // Note: It is not necessary to set the focus directly to the pane since that
+ // will be taken care of by the widget activation.
+ widget_activating_ = widget;
+ widget->Activate();
+ widget_activating_ = NULL;
+ return widget->IsActive();
}
} // namespace internal