diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 06:51:08 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 06:51:08 +0000 |
| commit | c44474c7f2e572e841743b72be19fa57ee833d3b (patch) | |
| tree | 86ee922f27d771210392adcb5c41a422f75a8ab1 /ui/aura/demo | |
| parent | a3cdfcfd2e526d6a6650ba790b6b8763ae9aadad (diff) | |
| download | chromium_src-c44474c7f2e572e841743b72be19fa57ee833d3b.zip chromium_src-c44474c7f2e572e841743b72be19fa57ee833d3b.tar.gz chromium_src-c44474c7f2e572e841743b72be19fa57ee833d3b.tar.bz2 | |
Remove unnecessary ui::CompositorTestSupport
The ui::CompositorTestSupport class existed to initialize WebKit since
ui::Compositor depends on cc which used to depend on WebKit being initialized
to function properly. cc no longer has this requirement, so this class is
unnecessary.
R=piman, sky
Review URL: https://chromiumcodereview.appspot.com/14744016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/demo')
| -rw-r--r-- | ui/aura/demo/demo_main.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index 41717d2..f6d5f27 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" @@ -110,7 +109,6 @@ class DemoStackingClient : public aura::client::StackingClient { int DemoMain() { // Create the message-loop here before creating the root window. base::MessageLoop message_loop(base::MessageLoop::TYPE_UI); - ui::CompositorTestSupport::Initialize(); aura::Env::GetInstance(); scoped_ptr<aura::TestScreen> test_screen(aura::TestScreen::Create()); gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get()); @@ -147,8 +145,6 @@ int DemoMain() { root_window->ShowRootWindow(); base::MessageLoopForUI::current()->Run(); - ui::CompositorTestSupport::Terminate(); - return 0; } |