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

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

Issue 2311393004: Laser tool blocks events from propagating. (Closed)
Patch Set: Fixed patch set 4 errors. Created 4 years, 3 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/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 bool WmShellMus::IsTouchDown() { 400 bool WmShellMus::IsTouchDown() {
401 // TODO: implement me, http://crbug.com/634967. 401 // TODO: implement me, http://crbug.com/634967.
402 // NOTIMPLEMENTED is too spammy here. 402 // NOTIMPLEMENTED is too spammy here.
403 return false; 403 return false;
404 } 404 }
405 405
406 #if defined(OS_CHROMEOS) 406 #if defined(OS_CHROMEOS)
407 void WmShellMus::ToggleIgnoreExternalKeyboard() { 407 void WmShellMus::ToggleIgnoreExternalKeyboard() {
408 NOTIMPLEMENTED(); 408 NOTIMPLEMENTED();
409 } 409 }
410
411 void WmShellMus::SetLaserPointerEnabled(bool enabled) {
412 NOTIMPLEMENTED();
413 }
410 #endif // defined(OS_CHROMEOS) 414 #endif // defined(OS_CHROMEOS)
411 415
412 ui::WindowTreeClient* WmShellMus::window_tree_client() { 416 ui::WindowTreeClient* WmShellMus::window_tree_client() {
413 return window_manager_->window_tree_client(); 417 return window_manager_->window_tree_client();
414 } 418 }
415 419
416 // static 420 // static
417 bool WmShellMus::IsActivationParent(ui::Window* window) { 421 bool WmShellMus::IsActivationParent(ui::Window* window) {
418 return window && IsActivatableShellWindowId( 422 return window && IsActivatableShellWindowId(
419 WmWindowMus::Get(window)->GetShellWindowId()); 423 WmWindowMus::Get(window)->GetShellWindowId());
(...skipping 14 matching lines...) Expand all
434 OnWindowActivated(gained_active, lost_active)); 438 OnWindowActivated(gained_active, lost_active));
435 } 439 }
436 440
437 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 441 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
438 DCHECK_EQ(window_tree_client(), client); 442 DCHECK_EQ(window_tree_client(), client);
439 client->RemoveObserver(this); 443 client->RemoveObserver(this);
440 } 444 }
441 445
442 } // namespace mus 446 } // namespace mus
443 } // namespace ash 447 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698