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

Side by Side Diff: ash/aura/wm_shell_aura.h

Issue 2235363003: Wires up WmShellMus::Add/RemovePointerWatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pointer_watcher_capture
Patch Set: merge to tot again 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 | « no previous file | ash/aura/wm_shell_aura.cc » ('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_AURA_WM_SHELL_AURA_H_ 5 #ifndef ASH_AURA_WM_SHELL_AURA_H_
6 #define ASH_AURA_WM_SHELL_AURA_H_ 6 #define ASH_AURA_WM_SHELL_AURA_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 CreateScopedDisableInternalMouseAndKeyboard() override; 62 CreateScopedDisableInternalMouseAndKeyboard() override;
63 std::unique_ptr<WmImmersiveFullscreenController> 63 std::unique_ptr<WmImmersiveFullscreenController>
64 CreateImmersiveFullscreenController() override; 64 CreateImmersiveFullscreenController() override;
65 void OnOverviewModeStarting() override; 65 void OnOverviewModeStarting() override;
66 void OnOverviewModeEnded() override; 66 void OnOverviewModeEnded() override;
67 SessionStateDelegate* GetSessionStateDelegate() override; 67 SessionStateDelegate* GetSessionStateDelegate() override;
68 void AddActivationObserver(WmActivationObserver* observer) override; 68 void AddActivationObserver(WmActivationObserver* observer) override;
69 void RemoveActivationObserver(WmActivationObserver* observer) override; 69 void RemoveActivationObserver(WmActivationObserver* observer) override;
70 void AddDisplayObserver(WmDisplayObserver* observer) override; 70 void AddDisplayObserver(WmDisplayObserver* observer) override;
71 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 71 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
72 void AddPointerWatcher(views::PointerWatcher* watcher) override; 72 void AddPointerWatcher(views::PointerWatcher* watcher,
73 bool wants_moves) override;
73 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 74 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
74 bool IsTouchDown() override; 75 bool IsTouchDown() override;
75 #if defined(OS_CHROMEOS) 76 #if defined(OS_CHROMEOS)
76 void ToggleIgnoreExternalKeyboard() override; 77 void ToggleIgnoreExternalKeyboard() override;
77 #endif 78 #endif
78 79
79 private: 80 private:
80 // aura::client::ActivationChangeObserver: 81 // aura::client::ActivationChangeObserver:
81 void OnWindowActivated(ActivationReason reason, 82 void OnWindowActivated(ActivationReason reason,
82 aura::Window* gained_active, 83 aura::Window* gained_active,
(...skipping 11 matching lines...) Expand all
94 95
95 bool added_display_observer_ = false; 96 bool added_display_observer_ = false;
96 base::ObserverList<WmDisplayObserver> display_observers_; 97 base::ObserverList<WmDisplayObserver> display_observers_;
97 98
98 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 99 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
99 }; 100 };
100 101
101 } // namespace ash 102 } // namespace ash
102 103
103 #endif // ASH_AURA_WM_SHELL_AURA_H_ 104 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698