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

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

Issue 2167643005: Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve conflicts Created 4 years, 5 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') | ash/mus/shell_delegate_mus.h » ('j') | 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 } 306 }
307 307
308 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { 308 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) {
309 NOTIMPLEMENTED(); 309 NOTIMPLEMENTED();
310 } 310 }
311 311
312 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { 312 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) {
313 NOTIMPLEMENTED(); 313 NOTIMPLEMENTED();
314 } 314 }
315 315
316 void WmShellMus::AddPointerDownWatcher(views::PointerDownWatcher* watcher) { 316 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) {
317 // TODO(jamescook): Move PointerDownWatcherDelegateMus to //ash/mus 317 // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here.
318 // and use here.
319 NOTIMPLEMENTED(); 318 NOTIMPLEMENTED();
320 } 319 }
321 320
322 void WmShellMus::RemovePointerDownWatcher(views::PointerDownWatcher* watcher) { 321 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
323 NOTIMPLEMENTED(); 322 NOTIMPLEMENTED();
324 } 323 }
325 324
326 #if defined(OS_CHROMEOS) 325 #if defined(OS_CHROMEOS)
327 void WmShellMus::ToggleIgnoreExternalKeyboard() { 326 void WmShellMus::ToggleIgnoreExternalKeyboard() {
328 NOTIMPLEMENTED(); 327 NOTIMPLEMENTED();
329 } 328 }
330 #endif // defined(OS_CHROMEOS) 329 #endif // defined(OS_CHROMEOS)
331 330
332 // static 331 // static
(...skipping 22 matching lines...) Expand all
355 OnWindowActivated(gained_active, lost_active)); 354 OnWindowActivated(gained_active, lost_active));
356 } 355 }
357 356
358 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) { 357 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) {
359 DCHECK_EQ(client, client_); 358 DCHECK_EQ(client, client_);
360 RemoveClientObserver(); 359 RemoveClientObserver();
361 } 360 }
362 361
363 } // namespace mus 362 } // namespace mus
364 } // namespace ash 363 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/shell_delegate_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698