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

Side by Side Diff: chrome/gpu/gpu_channel.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 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 | « chrome/common/worker_thread_ticker.cc ('k') | chrome/plugin/plugin_channel.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/gpu/gpu_channel.h" 5 #include "chrome/gpu/gpu_channel.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/lock.h"
13 #include "base/process_util.h" 12 #include "base/process_util.h"
14 #include "base/string_util.h" 13 #include "base/string_util.h"
15 #include "chrome/common/child_process.h" 14 #include "chrome/common/child_process.h"
16 #include "chrome/common/chrome_constants.h" 15 #include "chrome/common/chrome_constants.h"
17 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/gpu_messages.h" 17 #include "chrome/common/gpu_messages.h"
19 #include "chrome/gpu/gpu_thread.h" 18 #include "chrome/gpu/gpu_thread.h"
20 #include "chrome/gpu/gpu_video_service.h" 19 #include "chrome/gpu/gpu_video_service.h"
21 20
22 #if defined(OS_POSIX) 21 #if defined(OS_POSIX)
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 #if defined(OS_POSIX) 259 #if defined(OS_POSIX)
261 int GpuChannel::GetRendererFileDescriptor() { 260 int GpuChannel::GetRendererFileDescriptor() {
262 int fd = -1; 261 int fd = -1;
263 if (channel_.get()) { 262 if (channel_.get()) {
264 fd = channel_->GetClientFileDescriptor(); 263 fd = channel_->GetClientFileDescriptor();
265 } 264 }
266 return fd; 265 return fd;
267 } 266 }
268 #endif // defined(OS_POSIX) 267 #endif // defined(OS_POSIX)
269 268
OLDNEW
« no previous file with comments | « chrome/common/worker_thread_ticker.cc ('k') | chrome/plugin/plugin_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698