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

Side by Side Diff: services/ui/ws/window_manager_state.cc

Issue 2849083002: Add pointer id to the WebMouseEvent's constructors (Closed)
Patch Set: webmouseid Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "services/ui/ws/window_manager_state.h" 5 #include "services/ui/ws/window_manager_state.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 void WindowManagerState::ReleaseCaptureBlockedByAnyModalWindow() { 182 void WindowManagerState::ReleaseCaptureBlockedByAnyModalWindow() {
183 event_dispatcher_.ReleaseCaptureBlockedByAnyModalWindow(); 183 event_dispatcher_.ReleaseCaptureBlockedByAnyModalWindow();
184 } 184 }
185 185
186 void WindowManagerState::SetDragDropSourceWindow( 186 void WindowManagerState::SetDragDropSourceWindow(
187 DragSource* drag_source, 187 DragSource* drag_source,
188 ServerWindow* window, 188 ServerWindow* window,
189 DragTargetConnection* source_connection, 189 DragTargetConnection* source_connection,
190 const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data, 190 const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data,
191 uint32_t drag_operation) { 191 uint32_t drag_operation) {
192 int32_t drag_pointer = MouseEvent::kMousePointerId; 192 int32_t drag_pointer = MouseEvent::kDefaultMousePointerId;
193 if (in_flight_event_details_ && 193 if (in_flight_event_details_ &&
194 in_flight_event_details_->event->IsPointerEvent()) { 194 in_flight_event_details_->event->IsPointerEvent()) {
195 drag_pointer = 195 drag_pointer =
196 in_flight_event_details_->event->AsPointerEvent()->pointer_details().id; 196 in_flight_event_details_->event->AsPointerEvent()->pointer_details().id;
197 } else { 197 } else {
198 NOTIMPLEMENTED() << "Set drag drop set up during something other than a " 198 NOTIMPLEMENTED() << "Set drag drop set up during something other than a "
199 << "pointer event; rejecting drag."; 199 << "pointer event; rejecting drag.";
200 drag_source->OnDragCompleted(false, ui::mojom::kDropEffectNone); 200 drag_source->OnDragCompleted(false, ui::mojom::kDropEffectNone);
201 return; 201 return;
202 } 202 }
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 window->RemoveObserver(this); 700 window->RemoveObserver(this);
701 orphaned_window_manager_display_roots_.erase(iter); 701 orphaned_window_manager_display_roots_.erase(iter);
702 return; 702 return;
703 } 703 }
704 } 704 }
705 NOTREACHED(); 705 NOTREACHED();
706 } 706 }
707 707
708 } // namespace ws 708 } // namespace ws
709 } // namespace ui 709 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698