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/logging.h" | 7 #include "base/logging.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.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" |
12 #include "mojo/public/cpp/application/application_impl.h" | 13 #include "mojo/public/cpp/application/application_impl.h" |
| 14 #include "mojo/public/cpp/application/application_runner_chromium.h" |
13 #include "mojo/public/cpp/application/interface_factory_impl.h" | 15 #include "mojo/public/cpp/application/interface_factory_impl.h" |
14 #include "mojo/services/public/cpp/view_manager/node.h" | 16 #include "mojo/services/public/cpp/view_manager/node.h" |
15 #include "mojo/services/public/cpp/view_manager/node_observer.h" | 17 #include "mojo/services/public/cpp/view_manager/node_observer.h" |
16 #include "mojo/services/public/cpp/view_manager/view.h" | 18 #include "mojo/services/public/cpp/view_manager/view.h" |
17 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 19 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
18 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 20 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
19 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 21 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
20 #include "mojo/services/public/cpp/view_manager/view_observer.h" | 22 #include "mojo/services/public/cpp/view_manager/view_observer.h" |
21 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" | 23 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" |
22 #include "ui/events/event_constants.h" | 24 #include "ui/events/event_constants.h" |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 // TODO(aa): Verify new URL is same origin as current origin. | 164 // TODO(aa): Verify new URL is same origin as current origin. |
163 SkColor color = 0x00; | 165 SkColor color = 0x00; |
164 if (!base::HexStringToUInt(url.path().substr(1), &color)) { | 166 if (!base::HexStringToUInt(url.path().substr(1), &color)) { |
165 LOG(ERROR) << "Invalid URL, path not convertible to integer"; | 167 LOG(ERROR) << "Invalid URL, path not convertible to integer"; |
166 return; | 168 return; |
167 } | 169 } |
168 app_->SetNodeColor(node_id, color); | 170 app_->SetNodeColor(node_id, color); |
169 } | 171 } |
170 | 172 |
171 } // namespace examples | 173 } // namespace examples |
| 174 } // namespace mojo |
172 | 175 |
173 // static | 176 extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
174 ApplicationDelegate* ApplicationDelegate::Create() { | 177 MojoHandle shell_handle) { |
175 return new examples::EmbeddedApp; | 178 mojo::ApplicationRunnerChromium app; |
| 179 app.take_delegate(make_scoped_delegate(new mojo::examples::EmbeddedApp)); |
| 180 return app.Run(shell_handle); |
176 } | 181 } |
177 | |
178 } // namespace mojo | |
OLD | NEW |