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

Side by Side Diff: ui/surface/transport_dib.h

Issue 13428002: ui: Update the includes of base/shared_memory.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/gl/safe_shared_memory_pool.h ('k') | ui/surface/transport_dib_android.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_SURFACE_TRANSPORT_DIB_H_ 5 #ifndef UI_SURFACE_TRANSPORT_DIB_H_
6 #define UI_SURFACE_TRANSPORT_DIB_H_ 6 #define UI_SURFACE_TRANSPORT_DIB_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "ui/surface/surface_export.h" 9 #include "ui/surface/surface_export.h"
10 10
11 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) 11 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
12 #include "base/shared_memory.h" 12 #include "base/memory/shared_memory.h"
13 #endif 13 #endif
14 14
15 #if defined(OS_WIN) 15 #if defined(OS_WIN)
16 #include <windows.h> 16 #include <windows.h>
17 #elif defined(USE_X11) 17 #elif defined(USE_X11)
18 #include "ui/base/x/x11_util.h" 18 #include "ui/base/x/x11_util.h"
19 #endif 19 #endif
20 20
21 class SkCanvas; 21 class SkCanvas;
22 22
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 Display* display_; // connection to the X server 224 Display* display_; // connection to the X server
225 size_t inflight_counter_; // How many requests to the X server are in flight 225 size_t inflight_counter_; // How many requests to the X server are in flight
226 bool detached_; // If true, delete the transport DIB when it is idle 226 bool detached_; // If true, delete the transport DIB when it is idle
227 #endif 227 #endif
228 size_t size_; // length, in bytes 228 size_t size_; // length, in bytes
229 229
230 DISALLOW_COPY_AND_ASSIGN(TransportDIB); 230 DISALLOW_COPY_AND_ASSIGN(TransportDIB);
231 }; 231 };
232 232
233 #endif // UI_SURFACE_TRANSPORT_DIB_H_ 233 #endif // UI_SURFACE_TRANSPORT_DIB_H_
OLDNEW
« no previous file with comments | « ui/gl/safe_shared_memory_pool.h ('k') | ui/surface/transport_dib_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698