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

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 2 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/keyboard/keyboard_ui.h" 10 #include "ash/common/keyboard/keyboard_ui.h"
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 bool WmShellMus::IsTouchDown() { 407 bool WmShellMus::IsTouchDown() {
408 // TODO: implement me, http://crbug.com/634967. 408 // TODO: implement me, http://crbug.com/634967.
409 // NOTIMPLEMENTED is too spammy here. 409 // NOTIMPLEMENTED is too spammy here.
410 return false; 410 return false;
411 } 411 }
412 412
413 #if defined(OS_CHROMEOS) 413 #if defined(OS_CHROMEOS)
414 void WmShellMus::ToggleIgnoreExternalKeyboard() { 414 void WmShellMus::ToggleIgnoreExternalKeyboard() {
415 NOTIMPLEMENTED(); 415 NOTIMPLEMENTED();
416 } 416 }
417
418 void WmShellMus::SetLaserPointerEnabled(bool enabled) {
419 NOTIMPLEMENTED();
420 }
417 #endif // defined(OS_CHROMEOS) 421 #endif // defined(OS_CHROMEOS)
418 422
419 ui::WindowTreeClient* WmShellMus::window_tree_client() { 423 ui::WindowTreeClient* WmShellMus::window_tree_client() {
420 return window_manager_->window_tree_client(); 424 return window_manager_->window_tree_client();
421 } 425 }
422 426
423 // static 427 // static
424 bool WmShellMus::IsActivationParent(ui::Window* window) { 428 bool WmShellMus::IsActivationParent(ui::Window* window) {
425 return window && IsActivatableShellWindowId( 429 return window && IsActivatableShellWindowId(
426 WmWindowMus::Get(window)->GetShellWindowId()); 430 WmWindowMus::Get(window)->GetShellWindowId());
(...skipping 14 matching lines...) Expand all
441 OnWindowActivated(gained_active, lost_active)); 445 OnWindowActivated(gained_active, lost_active));
442 } 446 }
443 447
444 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 448 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
445 DCHECK_EQ(window_tree_client(), client); 449 DCHECK_EQ(window_tree_client(), client);
446 client->RemoveObserver(this); 450 client->RemoveObserver(this);
447 } 451 }
448 452
449 } // namespace mus 453 } // namespace mus
450 } // namespace ash 454 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698