OLD | NEW |
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/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/bind.h" | 6 #include "base/bind.h" |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "mojo/examples/window_manager/window_manager.mojom.h" | 9 #include "mojo/examples/window_manager/window_manager.mojom.h" |
10 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
11 #include "mojo/public/cpp/application/application_delegate.h" | 11 #include "mojo/public/cpp/application/application_delegate.h" |
| 12 #include "mojo/public/cpp/application/application_export.h" |
| 13 #include "mojo/public/cpp/application/application_runner_chromium.h" |
12 #include "mojo/public/cpp/application/interface_factory_impl.h" | 14 #include "mojo/public/cpp/application/interface_factory_impl.h" |
13 #include "mojo/services/public/cpp/view_manager/node.h" | 15 #include "mojo/services/public/cpp/view_manager/node.h" |
14 #include "mojo/services/public/cpp/view_manager/node_observer.h" | 16 #include "mojo/services/public/cpp/view_manager/node_observer.h" |
15 #include "mojo/services/public/cpp/view_manager/view.h" | 17 #include "mojo/services/public/cpp/view_manager/view.h" |
16 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 18 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
17 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 19 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
18 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 20 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
19 #include "mojo/services/public/cpp/view_manager/view_observer.h" | 21 #include "mojo/services/public/cpp/view_manager/view_observer.h" |
20 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" | 22 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" |
21 #include "ui/events/event_constants.h" | 23 #include "ui/events/event_constants.h" |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 GURL url(navigation_details->request->url.To<std::string>()); | 137 GURL url(navigation_details->request->url.To<std::string>()); |
136 if (!url.is_valid()) { | 138 if (!url.is_valid()) { |
137 LOG(ERROR) << "URL is invalid."; | 139 LOG(ERROR) << "URL is invalid."; |
138 return; | 140 return; |
139 } | 141 } |
140 app_->set_color(url.path().substr(1)); | 142 app_->set_color(url.path().substr(1)); |
141 app_->NavigateChild(); | 143 app_->NavigateChild(); |
142 } | 144 } |
143 | 145 |
144 } // namespace examples | 146 } // namespace examples |
| 147 } // namespace mojo |
145 | 148 |
146 // static | 149 extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
147 ApplicationDelegate* ApplicationDelegate::Create() { | 150 MojoHandle shell_handle) { |
148 return new examples::NestingApp; | 151 return mojo::ApplicationRunnerChromium( |
| 152 make_scoped_delegate(new mojo::examples::NestingApp)).Run(shell_handle); |
149 } | 153 } |
150 | |
151 } // namespace mojo | |
OLD | NEW |