| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/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/client/default_capture_client.h" | 11 #include "ui/aura/client/default_capture_client.h" |
| 12 #include "ui/aura/client/stacking_client.h" | 12 #include "ui/aura/client/stacking_client.h" |
| 13 #include "ui/aura/env.h" | 13 #include "ui/aura/env.h" |
| 14 #include "ui/aura/root_window.h" | 14 #include "ui/aura/root_window.h" |
| 15 #include "ui/aura/test/test_screen.h" | 15 #include "ui/aura/test/test_screen.h" |
| 16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
| 17 #include "ui/aura/window_delegate.h" | 17 #include "ui/aura/window_delegate.h" |
| 18 #include "ui/base/events/event.h" | 18 #include "ui/base/events/event.h" |
| 19 #include "ui/base/hit_test.h" | 19 #include "ui/base/hit_test.h" |
| 20 #include "ui/base/resource/resource_bundle.h" | 20 #include "ui/base/resource/resource_bundle.h" |
| 21 #include "ui/base/ui_base_paths.h" | 21 #include "ui/base/ui_base_paths.h" |
| 22 #include "ui/gfx/canvas.h" | 22 #include "ui/gfx/canvas.h" |
| 23 #include "ui/gfx/rect.h" | 23 #include "ui/gfx/rect.h" |
| 24 | 24 |
| 25 #if defined(USE_X11) | 25 #if defined(USE_X11) |
| 26 #include "base/message_pump_aurax11.h" | 26 #include "base/message_loop/message_pump_aurax11.h" |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 namespace { | 29 namespace { |
| 30 | 30 |
| 31 // Trivial WindowDelegate implementation that draws a colored background. | 31 // Trivial WindowDelegate implementation that draws a colored background. |
| 32 class DemoWindowDelegate : public aura::WindowDelegate { | 32 class DemoWindowDelegate : public aura::WindowDelegate { |
| 33 public: | 33 public: |
| 34 explicit DemoWindowDelegate(SkColor color) : color_(color) {} | 34 explicit DemoWindowDelegate(SkColor color) : color_(color) {} |
| 35 | 35 |
| 36 // Overridden from WindowDelegate: | 36 // Overridden from WindowDelegate: |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 | 155 |
| 156 // The exit manager is in charge of calling the dtors of singleton objects. | 156 // The exit manager is in charge of calling the dtors of singleton objects. |
| 157 base::AtExitManager exit_manager; | 157 base::AtExitManager exit_manager; |
| 158 | 158 |
| 159 ui::RegisterPathProvider(); | 159 ui::RegisterPathProvider(); |
| 160 icu_util::Initialize(); | 160 icu_util::Initialize(); |
| 161 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | 161 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 162 | 162 |
| 163 return DemoMain(); | 163 return DemoMain(); |
| 164 } | 164 } |
| OLD | NEW |