| 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "third_party/skia/include/core/SkXfermode.h" | 10 #include "third_party/skia/include/core/SkXfermode.h" |
| 11 #include "ui/aura/desktop.h" | 11 #include "ui/aura/desktop.h" |
| 12 #include "ui/aura/event.h" | 12 #include "ui/aura/event.h" |
| 13 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
| 14 #include "ui/aura/window_delegate.h" | 14 #include "ui/aura/window_delegate.h" |
| 15 #include "ui/base/hit_test.h" | 15 #include "ui/base/hit_test.h" |
| 16 #include "ui/base/resource/resource_bundle.h" | 16 #include "ui/base/resource/resource_bundle.h" |
| 17 #include "ui/base/ui_base_paths.h" | 17 #include "ui/base/ui_base_paths.h" |
| 18 #include "ui/gfx/canvas_skia.h" | 18 #include "ui/gfx/canvas_skia.h" |
| 19 #include "ui/gfx/compositor/compositor_test_support.h" | 19 #include "ui/gfx/compositor/test/compositor_test_support.h" |
| 20 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
| 21 | 21 |
| 22 #if defined(USE_X11) | 22 #if defined(USE_X11) |
| 23 #include "base/message_pump_x.h" | 23 #include "base/message_pump_x.h" |
| 24 #endif | 24 #endif |
| 25 | 25 |
| 26 namespace { | 26 namespace { |
| 27 | 27 |
| 28 // Trivial WindowDelegate implementation that draws a colored background. | 28 // Trivial WindowDelegate implementation that draws a colored background. |
| 29 class DemoWindowDelegate : public aura::WindowDelegate { | 29 class DemoWindowDelegate : public aura::WindowDelegate { |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 window3.SetBounds(gfx::Rect(10, 10, 50, 50)); | 110 window3.SetBounds(gfx::Rect(10, 10, 50, 50)); |
| 111 window3.Show(); | 111 window3.Show(); |
| 112 window3.SetParent(&window2); | 112 window3.SetParent(&window2); |
| 113 | 113 |
| 114 aura::Desktop::GetInstance()->Run(); | 114 aura::Desktop::GetInstance()->Run(); |
| 115 | 115 |
| 116 ui::CompositorTestSupport::Terminate(); | 116 ui::CompositorTestSupport::Terminate(); |
| 117 | 117 |
| 118 return 0; | 118 return 0; |
| 119 } | 119 } |
| 120 | |
| OLD | NEW |