diff options
| author | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:05:52 +0000 |
|---|---|---|
| committer | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:05:52 +0000 |
| commit | 4ef39e9b974e78b9cfabe4db2a7aab7da9333a98 (patch) | |
| tree | 8faebe2144cc01e266449b96b5d9237bcf8ee8fc /ui/aura_shell/examples/aura_shell_main.cc | |
| parent | 7f3c7afde3b300f5fc922493d494f9a9f6c36c0d (diff) | |
| download | chromium_src-4ef39e9b974e78b9cfabe4db2a7aab7da9333a98.zip chromium_src-4ef39e9b974e78b9cfabe4db2a7aab7da9333a98.tar.gz chromium_src-4ef39e9b974e78b9cfabe4db2a7aab7da9333a98.tar.bz2 | |
Revert 106606 - Use WebKit compositor in ui::Layer
BUG=99524
TEST=compositor_unittests
Review URL: http://codereview.chromium.org/8222028
TBR=piman@chromium.org
Review URL: http://codereview.chromium.org/8360018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/examples/aura_shell_main.cc')
| -rw-r--r-- | ui/aura_shell/examples/aura_shell_main.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/aura_shell/examples/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc index 414bcdd..486554b 100644 --- a/ui/aura_shell/examples/aura_shell_main.cc +++ b/ui/aura_shell/examples/aura_shell_main.cc @@ -15,7 +15,6 @@ #include "ui/aura_shell/shell_factory.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" -#include "ui/gfx/compositor/compositor_test_support.h" namespace { @@ -70,7 +69,6 @@ int main(int argc, char** argv) { // Create the message-loop here before creating the desktop. MessageLoop message_loop(MessageLoop::TYPE_UI); - ui::CompositorTestSupport::Initialize(); aura_shell::Shell::GetInstance()->SetDelegate(new ShellDelegateImpl);; @@ -80,8 +78,6 @@ int main(int argc, char** argv) { delete aura::Desktop::GetInstance(); - ui::CompositorTestSupport::Terminate(); - return 0; } |