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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.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 2 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
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_MUS_BRIDGE_WM_SHELL_MUS_H_ 5 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 std::unique_ptr<ImmersiveFullscreenController> 99 std::unique_ptr<ImmersiveFullscreenController>
100 CreateImmersiveFullscreenController() override; 100 CreateImmersiveFullscreenController() override;
101 void OnOverviewModeStarting() override; 101 void OnOverviewModeStarting() override;
102 void OnOverviewModeEnded() override; 102 void OnOverviewModeEnded() override;
103 SessionStateDelegate* GetSessionStateDelegate() override; 103 SessionStateDelegate* GetSessionStateDelegate() override;
104 void AddActivationObserver(WmActivationObserver* observer) override; 104 void AddActivationObserver(WmActivationObserver* observer) override;
105 void RemoveActivationObserver(WmActivationObserver* observer) override; 105 void RemoveActivationObserver(WmActivationObserver* observer) override;
106 void AddDisplayObserver(WmDisplayObserver* observer) override; 106 void AddDisplayObserver(WmDisplayObserver* observer) override;
107 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 107 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
108 void AddPointerWatcher(views::PointerWatcher* watcher, 108 void AddPointerWatcher(views::PointerWatcher* watcher,
109 bool wants_moves) override; 109 views::PointerWatcherEventTypes events) override;
110 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 110 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
111 bool IsTouchDown() override; 111 bool IsTouchDown() override;
112 #if defined(OS_CHROMEOS) 112 #if defined(OS_CHROMEOS)
113 void ToggleIgnoreExternalKeyboard() override; 113 void ToggleIgnoreExternalKeyboard() override;
114 #endif 114 #endif
115 115
116 private: 116 private:
117 friend class WmShellMusTestApi; 117 friend class WmShellMusTestApi;
118 118
119 ui::WindowTreeClient* window_tree_client(); 119 ui::WindowTreeClient* window_tree_client();
(...skipping 21 matching lines...) Expand all
141 141
142 base::ObserverList<WmActivationObserver> activation_observers_; 142 base::ObserverList<WmActivationObserver> activation_observers_;
143 143
144 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 144 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
145 }; 145 };
146 146
147 } // namespace mus 147 } // namespace mus
148 } // namespace ash 148 } // namespace ash
149 149
150 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 150 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698