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

Unified Diff: ui/aura_shell/examples/aura_shell_main.cc

Issue 8222028: Use WebKit compositor in ui::Layer (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase 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_shell/aura_shell.gyp ('k') | ui/aura_shell/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/examples/aura_shell_main.cc
diff --git a/ui/aura_shell/examples/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc
index aa8fc7d74969ecd1e89dea9deb14ea47319472df..a2688e16530dc8803073edd273ffdd9f69367a53 100644
--- a/ui/aura_shell/examples/aura_shell_main.cc
+++ b/ui/aura_shell/examples/aura_shell_main.cc
@@ -15,6 +15,7 @@
#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 {
@@ -69,6 +70,7 @@ 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);;
@@ -78,6 +80,8 @@ int main(int argc, char** argv) {
delete aura::Desktop::GetInstance();
+ ui::CompositorTestSupport::Terminate();
+
return 0;
}
« no previous file with comments | « ui/aura_shell/aura_shell.gyp ('k') | ui/aura_shell/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698