| Index: ash/common/wm/overview/window_selector.cc
|
| diff --git a/ash/common/wm/overview/window_selector.cc b/ash/common/wm/overview/window_selector.cc
|
| index 685b933c811c92b27a251bcda587959e005bbccd..3963265ca1f9ed5a3ee79ef88ae500c5960068e3 100644
|
| --- a/ash/common/wm/overview/window_selector.cc
|
| +++ b/ash/common/wm/overview/window_selector.cc
|
| @@ -97,7 +97,7 @@ struct WindowSelectorItemTargetComparator {
|
| : target(target_window) {}
|
|
|
| bool operator()(WindowSelectorItem* window) const {
|
| - return window->GetWindow() == target;
|
| + return window->Contains(target);
|
| }
|
|
|
| const WmWindow* target;
|
| @@ -567,10 +567,8 @@ void WindowSelector::OnWindowActivated(WmWindow* gained_active,
|
| auto iter = std::find_if(windows.begin(), windows.end(),
|
| WindowSelectorItemTargetComparator(gained_active));
|
|
|
| - if (iter != windows.end()) {
|
| - (*iter)->ShowWindowOnExit();
|
| - } else if (showing_text_filter_ &&
|
| - lost_active == GetTextFilterWidgetWindow()) {
|
| + if (iter == windows.end() && showing_text_filter_ &&
|
| + lost_active == GetTextFilterWidgetWindow()) {
|
| return;
|
| }
|
|
|
|
|