| commit | 5294a92e5f0f2ae8e8eb521d85bba6803dab6138 | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Nov 23 21:05:58 2012 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Nov 23 21:05:58 2012 |
| tree | 861df051d1a4eec15f57b82a6c7eb3f7b929f7b4 | |
| parent | 59514bfb9f9ff108b3cf0a3f9584e44b440e739d [diff] [blame] |
Revert 169355 - Remove compositor_test_support It is not needed anymore after https://codereview.chromium.org/11415089/ BUG=159278 Review URL: https://chromiumcodereview.appspot.com/11348171 [email protected] Review URL: https://codereview.chromium.org/11308187 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169367 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index 5b8fa33..91c95d3c 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc
@@ -19,6 +19,7 @@ #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" @@ -120,6 +121,7 @@ int DemoMain() { // Create the message-loop here before creating the root window. MessageLoop message_loop(MessageLoop::TYPE_UI); + ui::CompositorTestSupport::Initialize(); aura::Env::GetInstance(); aura::TestScreen test_screen; gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, &test_screen); @@ -156,6 +158,8 @@ root_window->ShowRootWindow(); MessageLoopForUI::current()->Run(); + ui::CompositorTestSupport::Terminate(); + return 0; }