| 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/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/i18n/icu_util.h" | 8 #include "base/i18n/icu_util.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "ui/gfx/canvas.h" | 29 #include "ui/gfx/canvas.h" |
| 30 #include "ui/gfx/rect.h" | 30 #include "ui/gfx/rect.h" |
| 31 #include "ui/gfx/skia_util.h" | 31 #include "ui/gfx/skia_util.h" |
| 32 #ifndef GL_GLEXT_PROTOTYPES | 32 #ifndef GL_GLEXT_PROTOTYPES |
| 33 #define GL_GLEXT_PROTOTYPES 1 | 33 #define GL_GLEXT_PROTOTYPES 1 |
| 34 #endif | 34 #endif |
| 35 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" | 35 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" |
| 36 #include "third_party/khronos/GLES2/gl2ext.h" | 36 #include "third_party/khronos/GLES2/gl2ext.h" |
| 37 | 37 |
| 38 #if defined(USE_X11) | 38 #if defined(USE_X11) |
| 39 #include "base/message_loop/message_pump_aurax11.h" | 39 #include "base/message_loop/message_pump_x11.h" |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 using base::TimeTicks; | 42 using base::TimeTicks; |
| 43 using ui::Compositor; | 43 using ui::Compositor; |
| 44 using ui::Layer; | 44 using ui::Layer; |
| 45 using ui::LayerDelegate; | 45 using ui::LayerDelegate; |
| 46 using WebKit::WebGraphicsContext3D; | 46 using WebKit::WebGraphicsContext3D; |
| 47 | 47 |
| 48 namespace { | 48 namespace { |
| 49 | 49 |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 ui::PrintLayerHierarchy(root_window->layer(), gfx::Point(100, 100)); | 358 ui::PrintLayerHierarchy(root_window->layer(), gfx::Point(100, 100)); |
| 359 #endif | 359 #endif |
| 360 | 360 |
| 361 root_window->ShowRootWindow(); | 361 root_window->ShowRootWindow(); |
| 362 base::MessageLoopForUI::current()->Run(); | 362 base::MessageLoopForUI::current()->Run(); |
| 363 focus_client.reset(); | 363 focus_client.reset(); |
| 364 root_window.reset(); | 364 root_window.reset(); |
| 365 | 365 |
| 366 return 0; | 366 return 0; |
| 367 } | 367 } |
| OLD | NEW |