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

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

Issue 2955203002: Cros Tablet Window management - Split Screen part II (Closed)
Patch Set: Fix the failed ash_unittest. Created 3 years, 5 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 | « ash/wm/overview/window_grid.cc ('k') | ash/wm/overview/window_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/window_selector.h
diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h
index 72913ff2badd476cdcfd4ce87af70a332015fc36..8e99394125188d8d35f3dd11f382fadc94b8c4d5 100644
--- a/ash/wm/overview/window_selector.h
+++ b/ash/wm/overview/window_selector.h
@@ -13,6 +13,7 @@
#include <vector>
#include "ash/ash_export.h"
+#include "ash/wm/splitview/split_view_controller.h"
#include "base/macros.h"
#include "base/time/time.h"
#include "ui/aura/window_observer.h"
@@ -21,6 +22,11 @@
#include "ui/views/controls/textfield/textfield_controller.h"
#include "ui/wm/public/activation_change_observer.h"
+namespace gfx {
+class Point;
+class Rect;
+} // namespace gfx
+
namespace views {
class Textfield;
class Widget;
@@ -31,13 +37,15 @@ class WindowSelectorDelegate;
class WindowSelectorItem;
class WindowSelectorTest;
class WindowGrid;
+class OverviewWindowDragController;
// The WindowSelector shows a grid of all of your windows, allowing to select
// one by clicking or tapping on it.
class ASH_EXPORT WindowSelector : public display::DisplayObserver,
public aura::WindowObserver,
public ::wm::ActivationChangeObserver,
- public views::TextfieldController {
+ public views::TextfieldController,
+ public SplitViewController::Observer {
public:
// Returns true if the window can be selected in overview mode.
static bool IsSelectable(aura::Window* window);
@@ -75,6 +83,20 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
// Called when |window| is about to get closed.
void WindowClosing(WindowSelectorItem* window);
+ // Called to set bounds for window grids. Used for split view.
+ void SetBoundsForWindowGridsInScreen(const gfx::Rect& bounds);
+
+ // Removes the window selector item from the overview window grid.
+ void RemoveWindowSelectorItem(WindowSelectorItem* item);
+
+ void InitiateDrag(WindowSelectorItem* item,
+ const gfx::Point& location_in_screen);
+ void Drag(WindowSelectorItem* item, const gfx::Point& location_in_screen);
+ void CompleteDrag(WindowSelectorItem* item);
+
+ // Positions all of the windows in the overview.
+ void PositionWindows(bool animate);
+
WindowSelectorDelegate* delegate() { return delegate_; }
bool restoring_minimized_windows() const {
@@ -85,6 +107,11 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
bool is_shut_down() const { return is_shut_down_; }
+ const std::vector<std::unique_ptr<WindowGrid>>& grid_list_for_testing()
+ const {
+ return grid_list_;
+ }
+
// display::DisplayObserver:
void OnDisplayAdded(const display::Display& display) override;
void OnDisplayRemoved(const display::Display& display) override;
@@ -108,15 +135,16 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
bool HandleKeyEvent(views::Textfield* sender,
const ui::KeyEvent& key_event) override;
+ // SplitViewController::Observer:
+ void OnSplitViewStateChanged(SplitViewController::State previous_state,
+ SplitViewController::State state) override;
+
private:
friend class WindowSelectorTest;
// Returns the aura::Window for |text_filter_widget_|.
aura::Window* GetTextFilterWidgetWindow();
- // Position all of the windows in the overview.
- void PositionWindows(bool animate);
-
// Repositions and resizes |text_filter_widget_| on
// DisplayMetricsChanged event.
void RepositionTextFilterOnDisplayMetricsChange();
@@ -193,6 +221,9 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
bool is_shut_down_ = false;
+ // The drag controller for a window in the overview mode.
+ std::unique_ptr<OverviewWindowDragController> window_drag_controller_;
+
DISALLOW_COPY_AND_ASSIGN(WindowSelector);
};
« no previous file with comments | « ash/wm/overview/window_grid.cc ('k') | ash/wm/overview/window_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698