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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2271393002: Wires up drags to pointer watcher adapter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 years, 4 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 "ash/mus/bridge/wm_shell_mus.h" 5 #include "ash/mus/bridge/wm_shell_mus.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/display/display_info.h" 10 #include "ash/common/display/display_info.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 367
368 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { 368 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) {
369 NOTIMPLEMENTED(); 369 NOTIMPLEMENTED();
370 } 370 }
371 371
372 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { 372 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) {
373 NOTIMPLEMENTED(); 373 NOTIMPLEMENTED();
374 } 374 }
375 375
376 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher, 376 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher,
377 bool wants_moves) { 377 bool wants_moves,
378 bool wants_drags) {
378 pointer_watcher_event_router_->AddPointerWatcher(watcher, wants_moves); 379 pointer_watcher_event_router_->AddPointerWatcher(watcher, wants_moves);
sky 2016/08/24 23:33:01 Add a NOTIMPLEMENTED in file a bug here for the mu
sammiequon 2016/08/25 23:11:18 Done.
379 } 380 }
380 381
381 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { 382 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
382 pointer_watcher_event_router_->RemovePointerWatcher(watcher); 383 pointer_watcher_event_router_->RemovePointerWatcher(watcher);
383 } 384 }
384 385
385 bool WmShellMus::IsTouchDown() { 386 bool WmShellMus::IsTouchDown() {
386 // TODO: implement me, http://crbug.com/634967. 387 // TODO: implement me, http://crbug.com/634967.
387 // NOTIMPLEMENTED is too spammy here. 388 // NOTIMPLEMENTED is too spammy here.
388 return false; 389 return false;
(...skipping 30 matching lines...) Expand all
419 OnWindowActivated(gained_active, lost_active)); 420 OnWindowActivated(gained_active, lost_active));
420 } 421 }
421 422
422 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 423 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
423 DCHECK_EQ(window_tree_client(), client); 424 DCHECK_EQ(window_tree_client(), client);
424 client->RemoveObserver(this); 425 client->RemoveObserver(this);
425 } 426 }
426 427
427 } // namespace mus 428 } // namespace mus
428 } // namespace ash 429 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698