Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: ui/aura/demo/demo_main.cc

Issue 14744016: Remove unnecessary ui::CompositorTestSupport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add compositor_test_support dependency to ui/snapshot and ui/views test targets Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/bench/bench_main.cc ('k') | ui/aura/test/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/demo/demo_main.cc
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 41717d268de4f10d60981ee00bed8338486f1948..f6d5f27ff15a8bfb65a4779ad9e3494c2839fa89 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;
}
« no previous file with comments | « ui/aura/bench/bench_main.cc ('k') | ui/aura/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698