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

Unified Diff: ash/wm/overview/window_selector.h

Issue 260883005: Separated alt-tab window cycle from overview mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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
Index: ash/wm/overview/window_selector.h
diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h
index 2139a17329afa2d38c0d439e91065cfcaf28d4ce..4313e9737d3b12d8939e045bbed098724d31e99f 100644
--- a/ash/wm/overview/window_selector.h
+++ b/ash/wm/overview/window_selector.h
@@ -20,10 +20,6 @@ namespace aura {
class RootWindow;
}
-namespace ui {
-class EventHandler;
-}
-
namespace ash {
class ScopedShowWindow;
class WindowOverview;
@@ -42,21 +38,13 @@ class ASH_EXPORT WindowSelector
FORWARD,
BACKWARD
};
- enum Mode {
- CYCLE,
- OVERVIEW
- };
typedef std::vector<aura::Window*> WindowList;
WindowSelector(const WindowList& windows,
- Mode mode,
WindowSelectorDelegate* delegate);
virtual ~WindowSelector();
- // Step to the next window in |direction|.
- void Step(Direction direction);
-
// Choose the currently selected window.
void SelectWindow();
@@ -66,8 +54,6 @@ class ASH_EXPORT WindowSelector
// Cancels window selection.
void CancelSelection();
- Mode mode() { return mode_; }
-
// aura::WindowObserver:
virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;
virtual void OnWindowBoundsChanged(aura::Window* window,
@@ -99,17 +85,6 @@ class ASH_EXPORT WindowSelector
// Tracks observed windows.
std::set<aura::Window*> observed_windows_;
- // The window selection mode.
- Mode mode_;
-
- // An event handler listening for the release of the alt key during alt-tab
- // cycling.
- scoped_ptr<ui::EventHandler> event_handler_;
-
- // The currently selected window being shown (temporarily brought to the front
- // of the stacking order and made visible).
- scoped_ptr<ScopedShowWindow> showing_window_;
-
scoped_ptr<WindowOverview> window_overview_;
// The time when window cycling was started.

Powered by Google App Engine
This is Rietveld 408576698