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

Side by Side Diff: ui/aura/window_tree_host.h

Issue 503883004: Don't pass touches to gesture recognizer for async acks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address (most of) sadrul's comments. Created 5 years, 10 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_AURA_WINDOW_TREE_HOST_H_ 5 #ifndef UI_AURA_WINDOW_TREE_HOST_H_
6 #define UI_AURA_WINDOW_TREE_HOST_H_ 6 #define UI_AURA_WINDOW_TREE_HOST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/event_types.h" 10 #include "base/event_types.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 const gfx::Point& host_location); 175 const gfx::Point& host_location);
176 176
177 // We don't use a scoped_ptr for |window_| since we need this ptr to be valid 177 // We don't use a scoped_ptr for |window_| since we need this ptr to be valid
178 // during its deletion. (Window's dtor notifies observers that may attempt to 178 // during its deletion. (Window's dtor notifies observers that may attempt to
179 // reach back up to access this object which will be valid until the end of 179 // reach back up to access this object which will be valid until the end of
180 // the dtor). 180 // the dtor).
181 Window* window_; // Owning. 181 Window* window_; // Owning.
182 182
183 ObserverList<WindowTreeHostObserver> observers_; 183 ObserverList<WindowTreeHostObserver> observers_;
184 184
185 scoped_ptr<WindowEventDispatcher> dispatcher_;
186
187 scoped_ptr<ui::Compositor> compositor_; 185 scoped_ptr<ui::Compositor> compositor_;
188 186
189 // Last cursor set. Used for testing. 187 // Last cursor set. Used for testing.
190 gfx::NativeCursor last_cursor_; 188 gfx::NativeCursor last_cursor_;
191 gfx::Point last_cursor_request_position_in_host_; 189 gfx::Point last_cursor_request_position_in_host_;
192 190
193 scoped_ptr<ui::ViewProp> prop_; 191 scoped_ptr<ui::ViewProp> prop_;
192 scoped_ptr<WindowEventDispatcher> dispatcher_;
sadrul 2015/02/10 19:10:15 Is this change in order necessary? if not, remove.
tdresser 2015/02/11 16:10:25 Done.
194 193
195 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost); 194 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
196 }; 195 };
197 196
198 } // namespace aura 197 } // namespace aura
199 198
200 #endif // UI_AURA_WINDOW_TREE_HOST_H_ 199 #endif // UI_AURA_WINDOW_TREE_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698