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 #include "aura/desktop.h" | |
6 #include "aura/desktop_host.h" | |
7 #include "aura/window.h" | |
8 #include "aura/window_delegate.h" | |
9 #include "base/at_exit.h" | 5 #include "base/at_exit.h" |
10 #include "base/command_line.h" | 6 #include "base/command_line.h" |
11 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" |
12 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
13 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
14 #include "third_party/skia/include/core/SkXfermode.h" | 10 #include "third_party/skia/include/core/SkXfermode.h" |
| 11 #include "ui/aura/desktop.h" |
| 12 #include "ui/aura/desktop_host.h" |
| 13 #include "ui/aura/window.h" |
| 14 #include "ui/aura/window_delegate.h" |
15 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
16 #include "ui/base/ui_base_paths.h" | 16 #include "ui/base/ui_base_paths.h" |
17 #include "ui/gfx/canvas.h" | 17 #include "ui/gfx/canvas.h" |
18 #include "ui/gfx/canvas_skia.h" | 18 #include "ui/gfx/canvas_skia.h" |
19 #include "ui/gfx/rect.h" | 19 #include "ui/gfx/rect.h" |
20 #include "views/widget/widget.h" | 20 #include "views/widget/widget.h" |
21 #include "views/widget/widget_delegate.h" | 21 #include "views/widget/widget_delegate.h" |
22 | 22 |
23 #if !defined(OS_WIN) | 23 #if !defined(OS_WIN) |
24 #include "aura/hit_test.h" | 24 #include "ui/aura/hit_test.h" |
25 #endif | 25 #endif |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 // Trivial WindowDelegate implementation that draws a colored background. | 29 // Trivial WindowDelegate implementation that draws a colored background. |
30 class DemoWindowDelegate : public aura::WindowDelegate { | 30 class DemoWindowDelegate : public aura::WindowDelegate { |
31 public: | 31 public: |
32 explicit DemoWindowDelegate(SkColor color) : color_(color) {} | 32 explicit DemoWindowDelegate(SkColor color) : color_(color) {} |
33 | 33 |
34 // Overridden from aura::WindowDelegate: | 34 // Overridden from aura::WindowDelegate: |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 contents, window2, gfx::Rect(120, 150, 200, 200)); | 169 contents, window2, gfx::Rect(120, 150, 200, 200)); |
170 views_window->Show(); | 170 views_window->Show(); |
171 | 171 |
172 aura::Desktop::GetInstance()->Run(); | 172 aura::Desktop::GetInstance()->Run(); |
173 | 173 |
174 delete aura::Desktop::GetInstance(); | 174 delete aura::Desktop::GetInstance(); |
175 | 175 |
176 return 0; | 176 return 0; |
177 } | 177 } |
178 | 178 |
OLD | NEW |