Wires up view manager to an actual display

mojo/services/view_manager/main.cc

Index: mojo/services/view_manager/main.cc
diff --git a/mojo/services/view_manager/view_manager.cc b/mojo/services/view_manager/main.cc
similarity index 87%
rename from mojo/services/view_manager/view_manager.cc
rename to mojo/services/view_manager/main.cc
index e2e09f5cb2fa5468dad4f25b9ddfd592dd707e5b..6ee84ba8b189c5fb9015ff2fe8aa6f8eb0f5a646 100644
--- a/mojo/services/view_manager/view_manager.cc
+++ b/mojo/services/view_manager/main.cc
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/at_exit.h"
+#include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/shell/application.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/view_manager_connection.h"
+#include "ui/aura/env.h"

[Ben Goodger (Google), 2014/05/07 17:21:36]

???

[sky, 2014/05/07 17:33:22]

Done.

 
 #if defined(WIN32)
 #if !defined(CDECL)
@@ -19,9 +22,11 @@
 
 extern "C" VIEW_MANAGER_EXPORT MojoResult CDECL MojoMain(
     MojoHandle shell_handle) {
+  CommandLine::Init(0, NULL);
+  base::AtExitManager at_exit;
   base::MessageLoop loop;
   mojo::Application app(shell_handle);
-  mojo::services::view_manager::RootNodeManager root_node_manager;
+  mojo::services::view_manager::RootNodeManager root_node_manager(app.shell());
   app.AddServiceConnector(new mojo::ServiceConnector
                           <mojo::services::view_manager::ViewManagerConnection,
                            mojo::services::view_manager::RootNodeManager>(