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

Side by Side Diff: mojo/runner/host/native_application_support.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
« no previous file with comments | « mojo/runner/host/native_application_support.h ('k') | mojo/runner/shell_apptest.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 "mojo/runner/host/native_application_support.h" 5 #include "mojo/runner/host/native_application_support.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "mojo/platform_handle/platform_handle_private_thunks.h" 11 #include "mojo/platform_handle/platform_handle_private_thunks.h"
12 #include "third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_e xtension_thunks.h" 12 #include "mojo/public/platform/native/gles2_impl_chromium_extension_thunks.h"
13 #include "third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h" 13 #include "mojo/public/platform/native/gles2_impl_thunks.h"
14 #include "third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h" 14 #include "mojo/public/platform/native/gles2_thunks.h"
15 #include "third_party/mojo/src/mojo/public/platform/native/system_thunks.h" 15 #include "mojo/public/platform/native/system_thunks.h"
16 16
17 namespace mojo { 17 namespace mojo {
18 namespace runner { 18 namespace runner {
19 19
20 namespace { 20 namespace {
21 21
22 template <typename Thunks> 22 template <typename Thunks>
23 bool SetThunks(Thunks (*make_thunks)(), 23 bool SetThunks(Thunks (*make_thunks)(),
24 const char* function_name, 24 const char* function_name,
25 base::NativeLibrary library) { 25 base::NativeLibrary library) {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 MojoHandle handle = application_request.PassMessagePipe().release().value(); 120 MojoHandle handle = application_request.PassMessagePipe().release().value();
121 MojoResult result = main_function(handle); 121 MojoResult result = main_function(handle);
122 if (result != MOJO_RESULT_OK) { 122 if (result != MOJO_RESULT_OK) {
123 LOG(ERROR) << "MojoMain returned error (result: " << result << ")"; 123 LOG(ERROR) << "MojoMain returned error (result: " << result << ")";
124 } 124 }
125 return true; 125 return true;
126 } 126 }
127 127
128 } // namespace runner 128 } // namespace runner
129 } // namespace mojo 129 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/runner/host/native_application_support.h ('k') | mojo/runner/shell_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698