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

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,fixes 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
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 486554b3f4d42e97ee02d61e621b6fd300e49400..5330c21a0c68b21220977f4fc4a80fcf2bb8b8cd 100644
--- a/ui/aura_shell/examples/aura_shell_main.cc
+++ b/ui/aura_shell/examples/aura_shell_main.cc
@@ -7,6 +7,7 @@
#include "base/i18n/icu_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
#include "ui/aura/desktop.h"
#include "ui/aura_shell/examples/toplevel_window.h"
#include "ui/aura_shell/launcher/launcher_types.h"
@@ -15,6 +16,7 @@
#include "ui/aura_shell/shell_factory.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
+#include "webkit/glue/webkitplatformsupport_impl.h"
namespace {
@@ -70,6 +72,9 @@ int main(int argc, char** argv) {
// Create the message-loop here before creating the desktop.
MessageLoop message_loop(MessageLoop::TYPE_UI);
+ webkit_glue::WebKitPlatformSupportImpl platform_support;
+ WebKit::initialize(&platform_support);
+
aura_shell::Shell::GetInstance()->SetDelegate(new ShellDelegateImpl);;
aura_shell::examples::InitWindowTypeLauncher();
@@ -78,6 +83,8 @@ int main(int argc, char** argv) {
delete aura::Desktop::GetInstance();
+ WebKit::shutdown();
+
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698