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

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

Issue 2218143002: Adds WmShell::IsTouchDown() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 329
330 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) { 330 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) {
331 // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here. 331 // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here.
332 NOTIMPLEMENTED(); 332 NOTIMPLEMENTED();
333 } 333 }
334 334
335 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { 335 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
336 NOTIMPLEMENTED(); 336 NOTIMPLEMENTED();
337 } 337 }
338 338
339 bool WmShellMus::IsTouchDown() {
340 // TODO: implement me, http://crbug.com/634967.
341 NOTIMPLEMENTED();
342 return false;
343 }
344
339 #if defined(OS_CHROMEOS) 345 #if defined(OS_CHROMEOS)
340 void WmShellMus::ToggleIgnoreExternalKeyboard() { 346 void WmShellMus::ToggleIgnoreExternalKeyboard() {
341 NOTIMPLEMENTED(); 347 NOTIMPLEMENTED();
342 } 348 }
343 #endif // defined(OS_CHROMEOS) 349 #endif // defined(OS_CHROMEOS)
344 350
345 ui::WindowTreeClient* WmShellMus::window_tree_client() { 351 ui::WindowTreeClient* WmShellMus::window_tree_client() {
346 return window_manager_->window_tree_client(); 352 return window_manager_->window_tree_client();
347 } 353 }
348 354
(...skipping 18 matching lines...) Expand all
367 OnWindowActivated(gained_active, lost_active)); 373 OnWindowActivated(gained_active, lost_active));
368 } 374 }
369 375
370 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 376 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
371 DCHECK_EQ(window_tree_client(), client); 377 DCHECK_EQ(window_tree_client(), client);
372 client->RemoveObserver(this); 378 client->RemoveObserver(this);
373 } 379 }
374 380
375 } // namespace mus 381 } // namespace mus
376 } // namespace ash 382 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698