| 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 AURA_WINDOW_H_ | 5 #ifndef UI_AURA_WINDOW_H_ |
| 6 #define AURA_WINDOW_H_ | 6 #define UI_AURA_WINDOW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "aura/aura_export.h" | |
| 12 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 13 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "ui/aura/aura_export.h" |
| 14 #include "ui/gfx/compositor/layer_delegate.h" | 14 #include "ui/gfx/compositor/layer_delegate.h" |
| 15 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
| 16 | 16 |
| 17 class SkCanvas; | 17 class SkCanvas; |
| 18 | 18 |
| 19 namespace ui { | 19 namespace ui { |
| 20 class Compositor; | 20 class Compositor; |
| 21 class Layer; | 21 class Layer; |
| 22 } | 22 } |
| 23 | 23 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 | 156 |
| 157 scoped_ptr<WindowManager> window_manager_; | 157 scoped_ptr<WindowManager> window_manager_; |
| 158 | 158 |
| 159 void* user_data_; | 159 void* user_data_; |
| 160 | 160 |
| 161 DISALLOW_COPY_AND_ASSIGN(Window); | 161 DISALLOW_COPY_AND_ASSIGN(Window); |
| 162 }; | 162 }; |
| 163 | 163 |
| 164 } // namespace aura | 164 } // namespace aura |
| 165 | 165 |
| 166 #endif // AURA_WINDOW_H_ | 166 #endif // UI_AURA_WINDOW_H_ |
| OLD | NEW |