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

Unified Diff: mojo/services/view_manager/main.cc

Issue 267293004: Wires up view manager to an actual display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 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 | « mojo/services/view_manager/DEPS ('k') | mojo/services/view_manager/node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 89%
rename from mojo/services/view_manager/view_manager.cc
rename to mojo/services/view_manager/main.cc
index e2e09f5cb2fa5468dad4f25b9ddfd592dd707e5b..1fd452857d84fcd266148b9bb7fead78defe5d34 100644
--- a/mojo/services/view_manager/view_manager.cc
+++ b/mojo/services/view_manager/main.cc
@@ -2,6 +2,8 @@
// 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"
@@ -19,9 +21,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>(
« no previous file with comments | « mojo/services/view_manager/DEPS ('k') | mojo/services/view_manager/node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698