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

Side by Side Diff: components/html_viewer/html_viewer_main.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/html_viewer/html_viewer.h" 5 #include "components/html_viewer/html_viewer.h"
6 #include "mojo/application/public/cpp/application_runner.h" 6 #include "mojo/application/public/cpp/application_runner.h"
7 #include "third_party/mojo/src/mojo/public/c/system/main.h" 7 #include "mojo/public/c/system/main.h"
8 8
9 // TODO(erg): Much of this will be the same between mojo applications. Maybe we 9 // TODO(erg): Much of this will be the same between mojo applications. Maybe we
10 // could centralize this code? 10 // could centralize this code?
11 #if defined(OS_LINUX) && !defined(OS_ANDROID) 11 #if defined(OS_LINUX) && !defined(OS_ANDROID)
12 #include "base/rand_util.h" 12 #include "base/rand_util.h"
13 #include "base/sys_info.h" 13 #include "base/sys_info.h"
14 #include "third_party/icu/source/i18n/unicode/timezone.h" 14 #include "third_party/icu/source/i18n/unicode/timezone.h"
15 15
16 // TODO(erg): Much of this was coppied from zygote_main_linux.cc 16 // TODO(erg): Much of this was coppied from zygote_main_linux.cc
17 extern "C" { 17 extern "C" {
(...skipping 11 matching lines...) Expand all
29 29
30 // TODO(erg): Perform OpenSSL warmup; it wants access to /dev/urandom. 30 // TODO(erg): Perform OpenSSL warmup; it wants access to /dev/urandom.
31 } 31 }
32 } 32 }
33 #endif // defined(OS_LINUX) && !defined(OS_ANDROID) 33 #endif // defined(OS_LINUX) && !defined(OS_ANDROID)
34 34
35 MojoResult MojoMain(MojoHandle shell_handle) { 35 MojoResult MojoMain(MojoHandle shell_handle) {
36 mojo::ApplicationRunner runner(new html_viewer::HTMLViewer); 36 mojo::ApplicationRunner runner(new html_viewer::HTMLViewer);
37 return runner.Run(shell_handle); 37 return runner.Run(shell_handle);
38 } 38 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698