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

Side by Side Diff: content/common/gpu/gpu_memory_manager.h

Issue 11722024: Remove some usage of the ENABLE_GPU macro. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | content/common/gpu/gpu_memory_manager.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 CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ 5 #ifndef CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_
6 #define CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ 6 #define CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_
7 7
8 #if defined(ENABLE_GPU)
9
10 #include <list> 8 #include <list>
11 #include <map> 9 #include <map>
12 10
13 #include "base/basictypes.h" 11 #include "base/basictypes.h"
14 #include "base/cancelable_callback.h" 12 #include "base/cancelable_callback.h"
15 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
16 #include "base/hash_tables.h" 14 #include "base/hash_tables.h"
17 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
18 #include "content/common/content_export.h" 16 #include "content/common/content_export.h"
19 #include "content/common/gpu/gpu_memory_allocation.h" 17 #include "content/common/gpu/gpu_memory_allocation.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 uint32 window_count_; 225 uint32 window_count_;
228 226
229 // Used to disable automatic changes to Manage() in testing. 227 // Used to disable automatic changes to Manage() in testing.
230 bool disable_schedule_manage_; 228 bool disable_schedule_manage_;
231 229
232 DISALLOW_COPY_AND_ASSIGN(GpuMemoryManager); 230 DISALLOW_COPY_AND_ASSIGN(GpuMemoryManager);
233 }; 231 };
234 232
235 } // namespace content 233 } // namespace content
236 234
237 #endif
238
239 #endif // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ 235 #endif // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | content/common/gpu/gpu_memory_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698