Chromium Code Reviews| Index: ash/wm/overview/window_overview.cc |
| diff --git a/ash/wm/overview/window_overview.cc b/ash/wm/overview/window_overview.cc |
| index ec5efc76a6bc8036a206850c48ed95be0ac1607e..33b7abd49b87c029a100b219fed3546e93f30ae0 100644 |
| --- a/ash/wm/overview/window_overview.cc |
| +++ b/ash/wm/overview/window_overview.cc |
| @@ -119,12 +119,10 @@ void CleanupWidgetAfterAnimationObserver::OnLayerAnimationScheduled( |
| } // namespace |
| WindowOverview::WindowOverview(WindowSelector* window_selector, |
| - WindowSelectorItemList* windows, |
| - aura::Window* single_root_window) |
| + WindowSelectorItemList* windows) |
| : window_selector_(window_selector), |
| windows_(windows), |
| selection_index_(0), |
| - single_root_window_(single_root_window), |
| overview_start_time_(base::Time::Now()), |
| cursor_client_(NULL) { |
| Shell* shell = Shell::GetInstance(); |
| @@ -248,11 +246,6 @@ void WindowOverview::OnWindowsChanged() { |
| PositionWindows(/* animate */ true); |
| } |
| -void WindowOverview::MoveToSingleRootWindow(aura::Window* root_window) { |
| - single_root_window_ = root_window; |
| - PositionWindows(/* animate */ true); |
| -} |
| - |
| void WindowOverview::OnKeyEvent(ui::KeyEvent* event) { |
| if (GetTargetedWindow(static_cast<aura::Window*>(event->target()))) |
| event->StopPropagation(); |
| @@ -268,7 +261,7 @@ void WindowOverview::OnMouseEvent(ui::MouseEvent* event) { |
| if (!target) |
| return; |
| - event->SetHandled(); |
| + event->StopPropagation(); |
|
tdanderson
2014/05/01 18:51:39
What is this change for?
Nina
2014/05/01 20:41:16
The reason was that with SetHandled the mouse even
tdanderson
2014/05/01 21:58:33
Sounds good (please file a separate bug for that).
|
| if (event->type() != ui::ET_MOUSE_RELEASED) |
| return; |
| @@ -372,18 +365,9 @@ void WindowOverview::HideAndTrackNonOverviewWindows() { |
| } |
| void WindowOverview::PositionWindows(bool animate) { |
| - if (single_root_window_) { |
| - std::vector<WindowSelectorItem*> windows; |
| - for (WindowSelectorItemList::iterator iter = windows_->begin(); |
| - iter != windows_->end(); ++iter) { |
| - windows.push_back(*iter); |
| - } |
| - PositionWindowsOnRoot(single_root_window_, windows, animate); |
| - } else { |
| - aura::Window::Windows root_window_list = Shell::GetAllRootWindows(); |
| - for (size_t i = 0; i < root_window_list.size(); ++i) |
| - PositionWindowsFromRoot(root_window_list[i], animate); |
| - } |
| + aura::Window::Windows root_window_list = Shell::GetAllRootWindows(); |
| + for (size_t i = 0; i < root_window_list.size(); ++i) |
| + PositionWindowsFromRoot(root_window_list[i], animate); |
| } |
| void WindowOverview::PositionWindowsFromRoot(aura::Window* root_window, |
| @@ -449,9 +433,7 @@ void WindowOverview::InitializeSelectionWidget() { |
| params.keep_on_top = false; |
| params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| params.opacity = views::Widget::InitParams::OPAQUE_WINDOW; |
| - params.parent = Shell::GetContainer(single_root_window_ |
| - ? single_root_window_ |
| - : windows_->front()->GetRootWindow(), |
| + params.parent = Shell::GetContainer(windows_->front()->GetRootWindow(), |
| kShellWindowId_DefaultContainer); |
| params.accept_events = false; |
| selection_widget_->set_focus_on_creation(false); |