diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 01:57:55 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 01:57:55 +0000 |
| commit | 7102ac7794891147ccb61a4df51e53622ea7c5b7 (patch) | |
| tree | f16da7ef551935e6ba23e9175b96e67e340b1df9 /mojo/examples/window_manager | |
| parent | ce6f7152d6036a9e52912345bc42c3559ba3f63e (diff) | |
| download | chromium_src-7102ac7794891147ccb61a4df51e53622ea7c5b7.zip chromium_src-7102ac7794891147ccb61a4df51e53622ea7c5b7.tar.gz chromium_src-7102ac7794891147ccb61a4df51e53622ea7c5b7.tar.bz2 | |
Mojo: Focus browser app on click.
R=ben@chromium.org
Review URL: https://codereview.chromium.org/353683009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/window_manager')
| -rw-r--r-- | mojo/examples/window_manager/window_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/examples/window_manager/window_manager.cc b/mojo/examples/window_manager/window_manager.cc index 047756b..aec383c 100644 --- a/mojo/examples/window_manager/window_manager.cc +++ b/mojo/examples/window_manager/window_manager.cc @@ -363,8 +363,8 @@ class WindowManager : public ApplicationDelegate, } bool IsDescendantOfKeyboard(View* target) { - return !keyboard_manager_.get() || - !keyboard_manager_->node()->Contains(target->node()); + return keyboard_manager_.get() && + keyboard_manager_->node()->Contains(target->node()); } void CreateControlPanel(view_manager::Node* root) { |