OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stdio.h> | 5 #include <stdio.h> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 scoped_ptr<aura::WindowTreeHost> window_tree_host_; | 260 scoped_ptr<aura::WindowTreeHost> window_tree_host_; |
261 | 261 |
262 bool pending_show_; | 262 bool pending_show_; |
263 }; | 263 }; |
264 | 264 |
265 } // namespace examples | 265 } // namespace examples |
266 } // namespace mojo | 266 } // namespace mojo |
267 | 267 |
268 extern "C" LAUNCHER_EXPORT MojoResult CDECL MojoMain( | 268 extern "C" LAUNCHER_EXPORT MojoResult CDECL MojoMain( |
269 MojoHandle shell_handle) { | 269 MojoHandle shell_handle) { |
270 CommandLine::Init(0, NULL); | 270 base::CommandLine::Init(0, NULL); |
271 base::AtExitManager at_exit; | 271 base::AtExitManager at_exit; |
272 base::i18n::InitializeICU(); | 272 base::i18n::InitializeICU(); |
273 | 273 |
274 base::FilePath pak_dir; | 274 base::FilePath pak_dir; |
275 PathService::Get(base::DIR_MODULE, &pak_dir); | 275 PathService::Get(base::DIR_MODULE, &pak_dir); |
276 base::FilePath pak_file; | 276 base::FilePath pak_file; |
277 pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak")); | 277 pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak")); |
278 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); | 278 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); |
279 | 279 |
280 base::MessageLoop loop; | 280 base::MessageLoop loop; |
281 mojo::GLES2Initializer gles2; | 281 mojo::GLES2Initializer gles2; |
282 | 282 |
283 // TODO(beng): This crashes in a DCHECK on X11 because this thread's | 283 // TODO(beng): This crashes in a DCHECK on X11 because this thread's |
284 // MessageLoop is not of TYPE_UI. I think we need a way to build | 284 // MessageLoop is not of TYPE_UI. I think we need a way to build |
285 // Aura that doesn't define platform-specific stuff. | 285 // Aura that doesn't define platform-specific stuff. |
286 aura::Env::CreateInstance(true); | 286 aura::Env::CreateInstance(true); |
287 | 287 |
288 mojo::Application app(shell_handle); | 288 mojo::Application app(shell_handle); |
289 app.AddService<mojo::examples::LauncherImpl>(&app); | 289 app.AddService<mojo::examples::LauncherImpl>(&app); |
290 | 290 |
291 loop.Run(); | 291 loop.Run(); |
292 return MOJO_RESULT_OK; | 292 return MOJO_RESULT_OK; |
293 } | 293 } |
OLD | NEW |