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

Side by Side Diff: ash/common/wm_shell.h

Issue 2271393002: Wires up drags to pointer watcher adapter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fixed patch set 8 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
« no previous file with comments | « ash/common/wm/immersive_context_ash.cc ('k') | ash/mus/bridge/wm_shell_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 #ifndef ASH_COMMON_WM_SHELL_H_ 5 #ifndef ASH_COMMON_WM_SHELL_H_
6 #define ASH_COMMON_WM_SHELL_H_ 6 #define ASH_COMMON_WM_SHELL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 12 matching lines...) Expand all
23 class ManagedDisplayInfo; 23 class ManagedDisplayInfo;
24 } 24 }
25 25
26 namespace gfx { 26 namespace gfx {
27 class Insets; 27 class Insets;
28 class Point; 28 class Point;
29 } 29 }
30 30
31 namespace views { 31 namespace views {
32 class PointerWatcher; 32 class PointerWatcher;
33 enum class PointerWatcherEventTypes;
33 } 34 }
34 35
35 namespace ash { 36 namespace ash {
36 37
37 class AcceleratorController; 38 class AcceleratorController;
38 class AccessibilityDelegate; 39 class AccessibilityDelegate;
39 class BrightnessControlDelegate; 40 class BrightnessControlDelegate;
40 class FocusCycler; 41 class FocusCycler;
41 class ImmersiveContextAsh; 42 class ImmersiveContextAsh;
42 class ImmersiveFullscreenController; 43 class ImmersiveFullscreenController;
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 323
323 virtual void AddActivationObserver(WmActivationObserver* observer) = 0; 324 virtual void AddActivationObserver(WmActivationObserver* observer) = 0;
324 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0; 325 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0;
325 326
326 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0; 327 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0;
327 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0; 328 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0;
328 329
329 void AddShellObserver(ShellObserver* observer); 330 void AddShellObserver(ShellObserver* observer);
330 void RemoveShellObserver(ShellObserver* observer); 331 void RemoveShellObserver(ShellObserver* observer);
331 332
332 // If |wants_moves| is true PointerWatcher::OnPointerEventObserved() is 333 // If |events| is PointerWatcherEventTypes::MOVES,
333 // called for pointer move events. Enabling pointer moves may incur a 334 // PointerWatcher::OnPointerEventObserved() is called for pointer move events.
334 // performance hit and should be avoided if possible. 335 // If |events| is PointerWatcherEventTypes::DRAGS,
336 // PointerWatcher::OnPointerEventObserved() is called for pointer drag events.
337 // Requesting pointer moves or drags may incur a performance hit and should be
338 // avoided if possible.
335 virtual void AddPointerWatcher(views::PointerWatcher* watcher, 339 virtual void AddPointerWatcher(views::PointerWatcher* watcher,
336 bool wants_moves) = 0; 340 views::PointerWatcherEventTypes events) = 0;
337 virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0; 341 virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0;
338 342
339 // TODO: Move these back to LockStateController when that has been moved. 343 // TODO: Move these back to LockStateController when that has been moved.
340 void OnLockStateEvent(LockStateObserver::EventType event); 344 void OnLockStateEvent(LockStateObserver::EventType event);
341 void AddLockStateObserver(LockStateObserver* observer); 345 void AddLockStateObserver(LockStateObserver* observer);
342 void RemoveLockStateObserver(LockStateObserver* observer); 346 void RemoveLockStateObserver(LockStateObserver* observer);
343 347
344 void SetShelfDelegateForTesting(std::unique_ptr<ShelfDelegate> test_delegate); 348 void SetShelfDelegateForTesting(std::unique_ptr<ShelfDelegate> test_delegate);
345 void SetPaletteDelegateForTesting( 349 void SetPaletteDelegateForTesting(
346 std::unique_ptr<PaletteDelegate> palette_delegate); 350 std::unique_ptr<PaletteDelegate> palette_delegate);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 bool simulate_modal_window_open_for_testing_ = false; 433 bool simulate_modal_window_open_for_testing_ = false;
430 434
431 #if defined(OS_CHROMEOS) 435 #if defined(OS_CHROMEOS)
432 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 436 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
433 #endif 437 #endif
434 }; 438 };
435 439
436 } // namespace ash 440 } // namespace ash
437 441
438 #endif // ASH_COMMON_WM_SHELL_H_ 442 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/wm/immersive_context_ash.cc ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698