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

Side by Side Diff: mojo/services/window_manager/main.cc

Issue 441853002: mojo: first take on removing mojo_main_{chromium,standalone}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mojo/services/view_manager/window_tree_host_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "mojo/public/c/system/main.h"
6 #include "mojo/public/cpp/application/application_delegate.h" 7 #include "mojo/public/cpp/application/application_delegate.h"
8 #include "mojo/public/cpp/application/application_runner_chromium.h"
7 #include "mojo/public/cpp/application/service_provider_impl.h" 9 #include "mojo/public/cpp/application/service_provider_impl.h"
8 #include "mojo/services/public/cpp/view_manager/view_manager.h" 10 #include "mojo/services/public/cpp/view_manager/view_manager.h"
9 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" 11 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
10 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h" 12 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h"
11 #include "mojo/services/window_manager/window_manager_app.h" 13 #include "mojo/services/window_manager/window_manager_app.h"
12 14
13 // ApplicationDelegate implementation file for WindowManager users (e.g. 15 // ApplicationDelegate implementation file for WindowManager users (e.g.
14 // core window manager tests) that do not want to provide their own 16 // core window manager tests) that do not want to provide their own
15 // ApplicationDelegate::Create(). 17 // ApplicationDelegate::Create().
16 18
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 virtual void DispatchEvent(EventPtr event) MOJO_OVERRIDE {} 64 virtual void DispatchEvent(EventPtr event) MOJO_OVERRIDE {}
63 65
64 scoped_ptr<WindowManagerApp> window_manager_app_; 66 scoped_ptr<WindowManagerApp> window_manager_app_;
65 67
66 ViewManager* view_manager_; 68 ViewManager* view_manager_;
67 View* root_; 69 View* root_;
68 70
69 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); 71 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager);
70 }; 72 };
71 73
72 // static 74 } // namespace mojo
73 ApplicationDelegate* ApplicationDelegate::Create() { 75
74 return new DefaultWindowManager; 76 MojoResult MojoMain(MojoHandle shell_handle) {
77 mojo::ApplicationRunnerChromium runner(new mojo::DefaultWindowManager);
78 return runner.Run(shell_handle);
75 } 79 }
76
77 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/view_manager/window_tree_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698