diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 05:14:26 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 05:14:26 +0000 |
| commit | 6b7c86c71e251def62deddcf5645eb462a432df6 (patch) | |
| tree | e564eddc1706718902ff6dd8b9f893a18cc5d576 /ash/focus_cycler.cc | |
| parent | bbb445ce1779864b088a1d8138870d55b3165b2e (diff) | |
| download | chromium_src-6b7c86c71e251def62deddcf5645eb462a432df6.zip chromium_src-6b7c86c71e251def62deddcf5645eb462a432df6.tar.gz chromium_src-6b7c86c71e251def62deddcf5645eb462a432df6.tar.bz2 | |
Makes it so the launcher only gets focus when using the keyboard.
BUG=114502
TEST=see bug
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9406031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/focus_cycler.cc')
| -rw-r--r-- | ash/focus_cycler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc index 25f74f3..eccb992 100644 --- a/ash/focus_cycler.cc +++ b/ash/focus_cycler.cc @@ -17,7 +17,7 @@ namespace ash { namespace internal { -FocusCycler::FocusCycler() { +FocusCycler::FocusCycler() : widget_activating_(NULL) { } FocusCycler::~FocusCycler() { @@ -71,7 +71,9 @@ void FocusCycler::RotateFocus(Direction direction) { views::AccessiblePaneView* view = static_cast<views::AccessiblePaneView*>(widget->GetContentsView()); if (view->SetPaneFocusAndFocusDefault()) { + widget_activating_ = widget; widget->Activate(); + widget_activating_ = NULL; if (widget->IsActive()) break; } |