Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2014)

Unified Diff: ash/common/wm/window_cycle_list.cc

Issue 2642273002: CrOS - Make it possible to Alt+Tab while dragging a tab (Closed)
Patch Set: fix tests Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/wm/window_cycle_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/window_cycle_list.cc
diff --git a/ash/common/wm/window_cycle_list.cc b/ash/common/wm/window_cycle_list.cc
index c486947c27bb94a0a357023e5f9b71fbbb12dc57..e60ebd090a4edf084d4e2df4916e421198314667 100644
--- a/ash/common/wm/window_cycle_list.cc
+++ b/ash/common/wm/window_cycle_list.cc
@@ -262,14 +262,8 @@ class WindowCycleView : public views::WidgetDelegateView {
target_window_ = target;
if (GetWidget()) {
Layout();
- if (target_window_) {
- // In the window destruction case, we may have already removed the
- // focused view and hence not be the focused window. We should still
- // always be active, though.
- DCHECK_EQ(ash::WmShell::Get()->GetActiveWindow()->GetInternalWidget(),
- GetWidget());
+ if (target_window_)
window_view_map_[target_window_]->RequestFocus();
- }
}
}
@@ -354,10 +348,6 @@ class WindowCycleView : public views::WidgetDelegateView {
}
}
- void OnMouseCaptureLost() override {
- WmShell::Get()->window_cycle_controller()->CancelCycling();
- }
-
void OnPaintBackground(gfx::Canvas* canvas) override {
// We can't set a bg on the mirror container itself because the highlight
// view needs to be on top of the bg but behind the target windows.
@@ -552,8 +542,6 @@ void WindowCycleList::InitWindowCycleView() {
screen_observer_.Add(display::Screen::GetScreen());
widget->Show();
- widget->SetCapture(cycle_view_);
- widget->set_auto_release_capture(false);
cycle_ui_widget_ = widget;
}
« no previous file with comments | « no previous file | ash/wm/window_cycle_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698