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

Side by Side Diff: content/common/pepper_file_util.h

Issue 1154613006: Update pepper to not assume that SharedMemoryHandle is an int. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another nits pass. Created 5 years, 6 months 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 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 #ifndef CONTENT_COMMON_PEPPER_FILE_UTIL_H_ 5 #ifndef CONTENT_COMMON_PEPPER_FILE_UTIL_H_
6 #define CONTENT_COMMON_PEPPER_FILE_UTIL_H_ 6 #define CONTENT_COMMON_PEPPER_FILE_UTIL_H_
7 7
8 #include "base/files/file.h" 8 #include "base/files/file.h"
9 #include "base/memory/shared_memory.h" 9 #include "base/memory/shared_memory.h"
10 #include "base/sync_socket.h" 10 #include "base/sync_socket.h"
11 #include "ppapi/c/pp_file_info.h" 11 #include "ppapi/c/pp_file_info.h"
12 #include "storage/common/fileapi/file_system_types.h" 12 #include "storage/common/fileapi/file_system_types.h"
13 13
14 #if !defined(ENABLE_PLUGINS) 14 #if !defined(ENABLE_PLUGINS)
15 #error "Plugins should be enabled" 15 #error "Plugins should be enabled"
16 #endif 16 #endif
17 17
18 namespace content { 18 namespace content {
19 19
20 storage::FileSystemType PepperFileSystemTypeToFileSystemType( 20 storage::FileSystemType PepperFileSystemTypeToFileSystemType(
21 PP_FileSystemType type); 21 PP_FileSystemType type);
22 22
23 base::PlatformFile PlatformFileFromSharedMemoryHandle(
24 const base::SharedMemoryHandle& shm_handle);
25
26 int IntegerFromSyncSocketHandle( 23 int IntegerFromSyncSocketHandle(
27 const base::SyncSocket::Handle& socket_handle); 24 const base::SyncSocket::Handle& socket_handle);
28 25
29 } // namespace content 26 } // namespace content
30 27
31 #endif // CONTENT_COMMON_PEPPER_FILE_UTIL_H_ 28 #endif // CONTENT_COMMON_PEPPER_FILE_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698