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

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

Issue 2491403003: chromeos: Move SystemTrayDelegate::RequestShutdown to WmShell (Closed)
Patch Set: Created 4 years, 1 month 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/key_event_watcher.h" 10 #include "ash/common/key_event_watcher.h"
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 // TODO: implement drags for mus pointer watcher, http://crbug.com/641164. 410 // TODO: implement drags for mus pointer watcher, http://crbug.com/641164.
411 // NOTIMPLEMENTED drags for mus pointer watcher. 411 // NOTIMPLEMENTED drags for mus pointer watcher.
412 pointer_watcher_event_router_->AddPointerWatcher( 412 pointer_watcher_event_router_->AddPointerWatcher(
413 watcher, events == views::PointerWatcherEventTypes::MOVES); 413 watcher, events == views::PointerWatcherEventTypes::MOVES);
414 } 414 }
415 415
416 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { 416 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
417 pointer_watcher_event_router_->RemovePointerWatcher(watcher); 417 pointer_watcher_event_router_->RemovePointerWatcher(watcher);
418 } 418 }
419 419
420 void WmShellMus::RequestShutdown() {
421 NOTIMPLEMENTED();
422 }
423
420 bool WmShellMus::IsTouchDown() { 424 bool WmShellMus::IsTouchDown() {
421 // TODO: implement me, http://crbug.com/634967. 425 // TODO: implement me, http://crbug.com/634967.
422 // NOTIMPLEMENTED is too spammy here. 426 // NOTIMPLEMENTED is too spammy here.
423 return false; 427 return false;
424 } 428 }
425 429
426 #if defined(OS_CHROMEOS) 430 #if defined(OS_CHROMEOS)
427 void WmShellMus::ToggleIgnoreExternalKeyboard() { 431 void WmShellMus::ToggleIgnoreExternalKeyboard() {
428 NOTIMPLEMENTED(); 432 NOTIMPLEMENTED();
429 } 433 }
(...skipping 28 matching lines...) Expand all
458 observer.OnWindowActivated(gained_active, lost_active); 462 observer.OnWindowActivated(gained_active, lost_active);
459 } 463 }
460 464
461 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 465 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
462 DCHECK_EQ(window_tree_client(), client); 466 DCHECK_EQ(window_tree_client(), client);
463 client->RemoveObserver(this); 467 client->RemoveObserver(this);
464 } 468 }
465 469
466 } // namespace mus 470 } // namespace mus
467 } // namespace ash 471 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698