| 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_DESKTOP_H_ | 5 #ifndef UI_AURA_DESKTOP_H_ |
| 6 #define AURA_DESKTOP_H_ | 6 #define UI_AURA_DESKTOP_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "aura/root_window.h" | |
| 10 #include "aura/aura_export.h" | |
| 11 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 12 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| 13 #include "base/task.h" | 11 #include "base/task.h" |
| 12 #include "ui/aura/root_window.h" |
| 13 #include "ui/aura/aura_export.h" |
| 14 #include "ui/gfx/compositor/compositor.h" | 14 #include "ui/gfx/compositor/compositor.h" |
| 15 #include "ui/gfx/native_widget_types.h" | 15 #include "ui/gfx/native_widget_types.h" |
| 16 | 16 |
| 17 namespace gfx { | 17 namespace gfx { |
| 18 class Size; | 18 class Size; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace aura { | 21 namespace aura { |
| 22 | 22 |
| 23 class DesktopHost; | 23 class DesktopHost; |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 static Desktop* instance_; | 70 static Desktop* instance_; |
| 71 | 71 |
| 72 // Used to schedule painting. | 72 // Used to schedule painting. |
| 73 ScopedRunnableMethodFactory<Desktop> schedule_paint_; | 73 ScopedRunnableMethodFactory<Desktop> schedule_paint_; |
| 74 | 74 |
| 75 DISALLOW_COPY_AND_ASSIGN(Desktop); | 75 DISALLOW_COPY_AND_ASSIGN(Desktop); |
| 76 }; | 76 }; |
| 77 | 77 |
| 78 } // namespace aura | 78 } // namespace aura |
| 79 | 79 |
| 80 #endif // AURA_DESKTOP_H_ | 80 #endif // UI_AURA_DESKTOP_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
