| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_H_ | 5 #ifndef UI_AURA_WINDOW_H_ |
| 6 #define UI_AURA_WINDOW_H_ | 6 #define UI_AURA_WINDOW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> |
| 10 #include <vector> | 11 #include <vector> |
| 11 | 12 |
| 12 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
| 13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/observer_list.h" | 15 #include "base/observer_list.h" |
| 15 #include "base/string16.h" | 16 #include "base/string16.h" |
| 16 #include "ui/base/events.h" | 17 #include "ui/base/events.h" |
| 17 #include "ui/aura/aura_export.h" | 18 #include "ui/aura/aura_export.h" |
| 18 #include "ui/aura/window_types.h" | 19 #include "ui/aura/window_types.h" |
| 19 #include "ui/gfx/compositor/layer.h" | 20 #include "ui/gfx/compositor/layer.h" |
| 20 #include "ui/gfx/compositor/layer_animator.h" | 21 #include "ui/gfx/compositor/layer_animator.h" |
| 21 #include "ui/gfx/compositor/layer_delegate.h" | 22 #include "ui/gfx/compositor/layer_delegate.h" |
| 22 #include "ui/gfx/native_widget_types.h" | 23 #include "ui/gfx/native_widget_types.h" |
| 23 #include "ui/gfx/rect.h" | 24 #include "ui/gfx/rect.h" |
| 24 | 25 |
| 25 class SkCanvas; | 26 class SkCanvas; |
| 26 | 27 |
| 27 namespace ui { | 28 namespace ui { |
| 28 class Animation; | |
| 29 class Compositor; | |
| 30 class Layer; | 29 class Layer; |
| 31 class LayerAnimationSequence; | |
| 32 class Transform; | 30 class Transform; |
| 33 } | 31 } |
| 34 | 32 |
| 35 namespace aura { | 33 namespace aura { |
| 36 | 34 |
| 37 class Desktop; | 35 class Desktop; |
| 38 class EventFilter; | 36 class EventFilter; |
| 39 class KeyEvent; | |
| 40 class LayoutManager; | 37 class LayoutManager; |
| 41 class MouseEvent; | |
| 42 class ToplevelWindowContainer; | |
| 43 class TouchEvent; | |
| 44 class WindowDelegate; | 38 class WindowDelegate; |
| 45 class WindowObserver; | 39 class WindowObserver; |
| 46 | 40 |
| 47 namespace internal { | 41 namespace internal { |
| 48 class FocusManager; | 42 class FocusManager; |
| 49 } | 43 } |
| 50 | 44 |
| 51 // Aura window implementation. Interesting events are sent to the | 45 // Aura window implementation. Interesting events are sent to the |
| 52 // WindowDelegate. | 46 // WindowDelegate. |
| 53 // TODO(beng): resolve ownership. | 47 // TODO(beng): resolve ownership. |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 // TODO(oshima): Consolidcate ViewProp and aura::window property | 342 // TODO(oshima): Consolidcate ViewProp and aura::window property |
| 349 // implementation. | 343 // implementation. |
| 350 std::map<const char*, void*> prop_map_; | 344 std::map<const char*, void*> prop_map_; |
| 351 | 345 |
| 352 DISALLOW_COPY_AND_ASSIGN(Window); | 346 DISALLOW_COPY_AND_ASSIGN(Window); |
| 353 }; | 347 }; |
| 354 | 348 |
| 355 } // namespace aura | 349 } // namespace aura |
| 356 | 350 |
| 357 #endif // UI_AURA_WINDOW_H_ | 351 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |