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

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 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_shell.h ('k') | ash/mus/bridge/wm_shell_mus.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_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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 std::unique_ptr<ImmersiveFullscreenController> 102 std::unique_ptr<ImmersiveFullscreenController>
103 CreateImmersiveFullscreenController() override; 103 CreateImmersiveFullscreenController() override;
104 void OnOverviewModeStarting() override; 104 void OnOverviewModeStarting() override;
105 void OnOverviewModeEnded() override; 105 void OnOverviewModeEnded() override;
106 SessionStateDelegate* GetSessionStateDelegate() override; 106 SessionStateDelegate* GetSessionStateDelegate() override;
107 void AddActivationObserver(WmActivationObserver* observer) override; 107 void AddActivationObserver(WmActivationObserver* observer) override;
108 void RemoveActivationObserver(WmActivationObserver* observer) override; 108 void RemoveActivationObserver(WmActivationObserver* observer) override;
109 void AddDisplayObserver(WmDisplayObserver* observer) override; 109 void AddDisplayObserver(WmDisplayObserver* observer) override;
110 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 110 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
111 void AddPointerWatcher(views::PointerWatcher* watcher, 111 void AddPointerWatcher(views::PointerWatcher* watcher,
112 bool wants_moves) override; 112 views::PointerWatcherEventTypes events) override;
113 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 113 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
114 bool IsTouchDown() override; 114 bool IsTouchDown() override;
115 #if defined(OS_CHROMEOS) 115 #if defined(OS_CHROMEOS)
116 void ToggleIgnoreExternalKeyboard() override; 116 void ToggleIgnoreExternalKeyboard() override;
117 #endif 117 #endif
118 118
119 private: 119 private:
120 friend class WmShellMusTestApi; 120 friend class WmShellMusTestApi;
121 121
122 ui::WindowTreeClient* window_tree_client(); 122 ui::WindowTreeClient* window_tree_client();
(...skipping 21 matching lines...) Expand all
144 144
145 base::ObserverList<WmActivationObserver> activation_observers_; 145 base::ObserverList<WmActivationObserver> activation_observers_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 147 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
148 }; 148 };
149 149
150 } // namespace mus 150 } // namespace mus
151 } // namespace ash 151 } // namespace ash
152 152
153 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 153 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698