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

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

Issue 1058163002: Replaces |shell_handle| with |application_request| as the name of the parameter to MojoMain(). (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « services/view_manager/main.cc ('k') | shell/test/pingable_app.cc » ('j') | 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/application/application_runner_chromium.h" 6 #include "mojo/application/application_runner_chromium.h"
7 #include "mojo/common/tracing_impl.h" 7 #include "mojo/common/tracing_impl.h"
8 #include "mojo/public/c/system/main.h" 8 #include "mojo/public/c/system/main.h"
9 #include "mojo/public/cpp/application/application_delegate.h" 9 #include "mojo/public/cpp/application/application_delegate.h"
10 #include "mojo/public/cpp/application/service_provider_impl.h" 10 #include "mojo/public/cpp/application/service_provider_impl.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 View* root_; 79 View* root_;
80 int window_offset_; 80 int window_offset_;
81 mojo::TracingImpl tracing_; 81 mojo::TracingImpl tracing_;
82 82
83 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); 83 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager);
84 }; 84 };
85 85
86 } // namespace window_manager 86 } // namespace window_manager
87 87
88 MojoResult MojoMain(MojoHandle shell_handle) { 88 MojoResult MojoMain(MojoHandle application_request) {
89 mojo::ApplicationRunnerChromium runner( 89 mojo::ApplicationRunnerChromium runner(
90 new window_manager::DefaultWindowManager); 90 new window_manager::DefaultWindowManager);
91 return runner.Run(shell_handle); 91 return runner.Run(application_request);
92 } 92 }
OLDNEW
« no previous file with comments | « services/view_manager/main.cc ('k') | shell/test/pingable_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698