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

Unified Diff: components/mus/public/cpp/lib/window_tree_client.cc

Issue 2060513002: Tab dragging as implemented as a mus API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: OnWmMoveLoopComplete() -> WmResponse() and use change_id instead of window_id in cancel. Created 4 years, 6 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: components/mus/public/cpp/lib/window_tree_client.cc
diff --git a/components/mus/public/cpp/lib/window_tree_client.cc b/components/mus/public/cpp/lib/window_tree_client.cc
index 7a43101ff6a809ad755b710c8bb4739fd90096c1..0ea699b8da283a3dc94f03a912a3ce58dd923574 100644
--- a/components/mus/public/cpp/lib/window_tree_client.cc
+++ b/components/mus/public/cpp/lib/window_tree_client.cc
@@ -232,8 +232,8 @@ bool WindowTreeClient::OwnsWindow(Window* window) const {
}
void WindowTreeClient::SetBounds(Window* window,
- const gfx::Rect& old_bounds,
- const gfx::Rect& bounds) {
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& bounds) {
DCHECK(tree_);
const uint32_t change_id = ScheduleInFlightChange(
base::WrapUnique(new InFlightBoundsChange(window, old_bounds)));
@@ -580,6 +580,17 @@ void WindowTreeClient::OnReceivedCursorLocationMemory(
DCHECK(cursor_location_mapping_);
}
+void WindowTreeClient::OnWmMoveLoopCompleted(uint32_t change_id,
+ bool completed) {
+ if (window_manager_internal_client_)
+ window_manager_internal_client_->WmResponse(change_id, completed);
+
+ if (change_id == current_wm_move_loop_change_) {
+ current_wm_move_loop_change_ = 0;
+ current_wm_move_loop_window_id_ = 0;
+ }
+}
+
////////////////////////////////////////////////////////////////////////////////
// WindowTreeClient, WindowTreeClient implementation:
@@ -624,6 +635,25 @@ void WindowTreeClient::SetEventObserver(mojom::EventMatcherPtr matcher) {
}
}
+void WindowTreeClient::PerformWindowMove(
+ Window* window,
+ ::mus::mojom::MoveLoopSource source,
+ const gfx::Point& cursor_location,
+ const base::Callback<void(bool)>& callback) {
+ DCHECK(on_current_move_finished_.is_null());
+ on_current_move_finished_ = callback;
+
+ current_move_loop_change_ = ScheduleInFlightChange(
+ base::WrapUnique(new InFlightMoveLoopChange(window)));
dcheng 2016/07/06 09:27:53 Nit: I'd suggest writing base::MakeUnique<InFlight
+ // Tell the window manager to take over moving us.
+ tree_->PerformWindowMove(current_move_loop_change_, window->server_id(),
+ source, cursor_location);
+}
+
+void WindowTreeClient::CancelWindowMove(Window* window) {
+ tree_->CancelWindowMove(window->server_id());
+}
+
Window* WindowTreeClient::NewWindow(
const Window::SharedProperties* properties) {
return NewWindowImpl(NewWindowType::CHILD, properties);
@@ -1019,6 +1049,12 @@ void WindowTreeClient::OnChangeCompleted(uint32_t change_id, bool success) {
} else if (!success) {
change->Revert();
}
+
+ if (change_id == current_move_loop_change_) {
+ current_move_loop_change_ = 0;
+ on_current_move_finished_.Run(success);
+ on_current_move_finished_.Reset();
+ }
}
void WindowTreeClient::GetWindowManager(
@@ -1069,9 +1105,9 @@ void WindowTreeClient::WmSetBounds(uint32_t change_id,
}
void WindowTreeClient::WmSetProperty(uint32_t change_id,
- Id window_id,
- const mojo::String& name,
- mojo::Array<uint8_t> transit_data) {
+ Id window_id,
+ const mojo::String& name,
+ mojo::Array<uint8_t> transit_data) {
Window* window = GetWindowByServerId(window_id);
bool result = false;
if (window) {
@@ -1108,7 +1144,7 @@ void WindowTreeClient::WmCreateTopLevelWindow(
}
void WindowTreeClient::WmClientJankinessChanged(ClientSpecificId client_id,
- bool janky) {
+ bool janky) {
if (window_manager_delegate_) {
auto it = embedded_windows_.find(client_id);
CHECK(it != embedded_windows_.end());
@@ -1117,6 +1153,37 @@ void WindowTreeClient::WmClientJankinessChanged(ClientSpecificId client_id,
}
}
+void WindowTreeClient::WmPerformMoveLoop(uint32_t change_id,
+ Id window_id,
+ ::mus::mojom::MoveLoopSource source,
+ const gfx::Point& cursor_location) {
+ if (!window_manager_delegate_ || current_wm_move_loop_change_ != 0) {
+ OnWmMoveLoopCompleted(change_id, false);
+ return;
+ }
+
+ current_wm_move_loop_change_ = change_id;
+ current_wm_move_loop_window_id_ = window_id;
+ Window* window = GetWindowByServerId(window_id);
+ if (window) {
+ window_manager_delegate_->OnWmPerformMoveLoop(
+ window, source, cursor_location,
+ base::Bind(&WindowTreeClient::OnWmMoveLoopCompleted,
+ weak_factory_.GetWeakPtr(), change_id));
+ } else {
+ OnWmMoveLoopCompleted(change_id, false);
+ }
+}
+
+void WindowTreeClient::WmCancelMoveLoop(uint32_t change_id) {
+ if (!window_manager_delegate_ || change_id != current_wm_move_loop_change_)
+ return;
+
+ Window* window = GetWindowByServerId(current_wm_move_loop_window_id_);
+ if (window)
+ window_manager_delegate_->OnWmCancelMoveLoop(window);
+}
+
void WindowTreeClient::OnAccelerator(uint32_t id,
std::unique_ptr<ui::Event> event) {
DCHECK(event);
@@ -1132,7 +1199,7 @@ void WindowTreeClient::SetFrameDecorationValues(
}
void WindowTreeClient::SetNonClientCursor(Window* window,
- mus::mojom::Cursor cursor_id) {
+ mus::mojom::Cursor cursor_id) {
window_manager_internal_client_->WmSetNonClientCursor(server_id(window),
cursor_id);
}

Powered by Google App Engine
This is Rietveld 408576698