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

Side by Side Diff: examples/ganesh_app/ganesh_app.cc

Issue 815003002: Nukes ViewManager arg from ViewManagerDelegate::OnEmbed (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: format Created 6 years 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 | « examples/embedded_app/embedded_app.cc ('k') | examples/keyboard/keyboard.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/macros.h" 5 #include "base/macros.h"
6 #include "examples/ganesh_app/ganesh_view.h" 6 #include "examples/ganesh_app/ganesh_view.h"
7 #include "mojo/application/application_runner_chromium.h" 7 #include "mojo/application/application_runner_chromium.h"
8 #include "mojo/public/c/system/main.h" 8 #include "mojo/public/c/system/main.h"
9 #include "mojo/public/cpp/application/application_connection.h" 9 #include "mojo/public/cpp/application/application_connection.h"
10 #include "mojo/public/cpp/application/application_delegate.h" 10 #include "mojo/public/cpp/application/application_delegate.h"
(...skipping 15 matching lines...) Expand all
26 view_manager_client_factory_.reset( 26 view_manager_client_factory_.reset(
27 new mojo::ViewManagerClientFactory(app->shell(), this)); 27 new mojo::ViewManagerClientFactory(app->shell(), this));
28 } 28 }
29 29
30 bool ConfigureIncomingConnection( 30 bool ConfigureIncomingConnection(
31 mojo::ApplicationConnection* connection) override { 31 mojo::ApplicationConnection* connection) override {
32 connection->AddService(view_manager_client_factory_.get()); 32 connection->AddService(view_manager_client_factory_.get());
33 return true; 33 return true;
34 } 34 }
35 35
36 void OnEmbed(mojo::ViewManager* view_manager, 36 void OnEmbed(mojo::View* root,
37 mojo::View* root,
38 mojo::ServiceProviderImpl* exported_services, 37 mojo::ServiceProviderImpl* exported_services,
39 scoped_ptr<mojo::ServiceProvider> imported_services) override { 38 scoped_ptr<mojo::ServiceProvider> imported_services) override {
40 new GaneshView(shell_, root); 39 new GaneshView(shell_, root);
41 } 40 }
42 41
43 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override { 42 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override {
44 base::MessageLoop::current()->Quit(); 43 base::MessageLoop::current()->Quit();
45 } 44 }
46 45
47 private: 46 private:
48 mojo::Shell* shell_; 47 mojo::Shell* shell_;
49 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; 48 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
50 49
51 DISALLOW_COPY_AND_ASSIGN(GaneshApp); 50 DISALLOW_COPY_AND_ASSIGN(GaneshApp);
52 }; 51 };
53 52
54 } // namespace examples 53 } // namespace examples
55 54
56 MojoResult MojoMain(MojoHandle shell_handle) { 55 MojoResult MojoMain(MojoHandle shell_handle) {
57 mojo::ApplicationRunnerChromium runner(new examples::GaneshApp); 56 mojo::ApplicationRunnerChromium runner(new examples::GaneshApp);
58 return runner.Run(shell_handle); 57 return runner.Run(shell_handle);
59 } 58 }
OLDNEW
« no previous file with comments | « examples/embedded_app/embedded_app.cc ('k') | examples/keyboard/keyboard.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698