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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8404041: Revert 107563 - Fix up compositor mocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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/aura.gyp ('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
===================================================================
--- ui/aura/demo/demo_main.cc (revision 107563)
+++ ui/aura/demo/demo_main.cc (working copy)
@@ -16,7 +16,6 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/gfx/canvas_skia.h"
-#include "ui/gfx/compositor/compositor_test_support.h"
#include "ui/gfx/rect.h"
#if defined(USE_X11)
@@ -82,7 +81,6 @@
// Create the message-loop here before creating the desktop.
MessageLoop message_loop(MessageLoop::TYPE_UI);
- ui::CompositorTestSupport::Initialize();
aura::Desktop::GetInstance();
@@ -112,9 +110,6 @@
window3.SetParent(&window2);
aura::Desktop::GetInstance()->Run();
-
- ui::CompositorTestSupport::Terminate();
-
return 0;
}
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698