summaryrefslogtreecommitdiffstats
path: root/ui/aura/demo
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-23 18:36:56 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-23 18:36:56 +0000
commit0cec7b8f7b26499afb55009ca9d53121bacb24fe (patch)
tree6dd7218b8be844a5f8d221f4d1bd2036f81f8325 /ui/aura/demo
parentc1a04512be0d81b9971f7bfea404c0072a86071d (diff)
downloadchromium_src-0cec7b8f7b26499afb55009ca9d53121bacb24fe.zip
chromium_src-0cec7b8f7b26499afb55009ca9d53121bacb24fe.tar.gz
chromium_src-0cec7b8f7b26499afb55009ca9d53121bacb24fe.tar.bz2
Remove compositor_test_support
It is not needed anymore after https://codereview.chromium.org/11415089/ BUG=159278 Review URL: https://chromiumcodereview.appspot.com/11348171 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/demo')
-rw-r--r--ui/aura/demo/demo_main.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 91c95d3..5b8fa33 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -19,7 +19,6 @@
#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"
@@ -121,7 +120,6 @@ class DemoStackingClient : public aura::client::StackingClient {
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);
@@ -158,8 +156,6 @@ int DemoMain() {
root_window->ShowRootWindow();
MessageLoopForUI::current()->Run();
- ui::CompositorTestSupport::Terminate();
-
return 0;
}