OLD | NEW |
---|---|
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_ROOT_WINDOW_H_ | 5 #ifndef UI_AURA_ROOT_WINDOW_H_ |
6 #define UI_AURA_ROOT_WINDOW_H_ | 6 #define UI_AURA_ROOT_WINDOW_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
290 | 290 |
291 // Overridden from Window: | 291 // Overridden from Window: |
292 virtual bool CanFocus() const OVERRIDE; | 292 virtual bool CanFocus() const OVERRIDE; |
293 virtual bool CanReceiveEvents() const OVERRIDE; | 293 virtual bool CanReceiveEvents() const OVERRIDE; |
294 virtual internal::FocusManager* GetFocusManager() OVERRIDE; | 294 virtual internal::FocusManager* GetFocusManager() OVERRIDE; |
295 | 295 |
296 // Overridden from ui::GestureEventHelper. | 296 // Overridden from ui::GestureEventHelper. |
297 virtual ui::GestureEvent* CreateGestureEvent(ui::EventType type, | 297 virtual ui::GestureEvent* CreateGestureEvent(ui::EventType type, |
298 const gfx::Point& location, | 298 const gfx::Point& location, |
299 int flags, | 299 int flags, |
300 const base::Time time, | 300 base::Time time, |
rjkroege
2012/05/09 16:48:15
revert this change? it is white space only
girard
2012/05/09 22:49:19
Fist change removed a (useless) const from the fun
| |
301 float param_first, | 301 float param_first, |
302 float param_second, | 302 float param_second, |
303 unsigned int touch_id_bitfield) OVERRIDE; | 303 unsigned int touch_id_bitfield) OVERRIDE; |
304 | 304 |
305 virtual ui::TouchEvent* CreateTouchEvent(ui::EventType type, | 305 virtual ui::TouchEvent* CreateTouchEvent(ui::EventType type, |
306 const gfx::Point& location, | 306 const gfx::Point& location, |
307 int touch_id, | 307 int touch_id, |
308 base::TimeDelta time_stamp) OVERRIDE; | 308 base::TimeDelta time_stamp) OVERRIDE; |
309 | 309 |
310 virtual bool DispatchLongPressGestureEvent(ui::GestureEvent* event) OVERRIDE; | 310 virtual bool DispatchLongPressGestureEvent(ui::GestureEvent* event) OVERRIDE; |
311 virtual bool DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE; | 311 virtual bool DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE; |
312 | 312 |
313 // Overridden from ui::LayerAnimationObserver: | 313 // Overridden from ui::LayerAnimationObserver: |
314 virtual void OnLayerAnimationEnded( | 314 virtual void OnLayerAnimationEnded( |
315 ui::LayerAnimationSequence* animation) OVERRIDE; | 315 ui::LayerAnimationSequence* animation) OVERRIDE; |
316 virtual void OnLayerAnimationScheduled( | 316 virtual void OnLayerAnimationScheduled( |
317 ui::LayerAnimationSequence* animation) OVERRIDE; | 317 ui::LayerAnimationSequence* animation) OVERRIDE; |
318 virtual void OnLayerAnimationAborted( | 318 virtual void OnLayerAnimationAborted( |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
404 bool draw_on_compositor_unlock_; | 404 bool draw_on_compositor_unlock_; |
405 | 405 |
406 int draw_trace_count_; | 406 int draw_trace_count_; |
407 | 407 |
408 DISALLOW_COPY_AND_ASSIGN(RootWindow); | 408 DISALLOW_COPY_AND_ASSIGN(RootWindow); |
409 }; | 409 }; |
410 | 410 |
411 } // namespace aura | 411 } // namespace aura |
412 | 412 |
413 #endif // UI_AURA_ROOT_WINDOW_H_ | 413 #endif // UI_AURA_ROOT_WINDOW_H_ |
OLD | NEW |