diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
| tree | 29f309f9534e05c47244eedb438fc612578d133b /base/scoped_handle.h | |
| parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
| download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 | |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
Diffstat (limited to 'base/scoped_handle.h')
| -rw-r--r-- | base/scoped_handle.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/base/scoped_handle.h b/base/scoped_handle.h index 43ee975..90cb5d5 100644 --- a/base/scoped_handle.h +++ b/base/scoped_handle.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,10 +10,6 @@ #include "base/basictypes.h" -#if defined(OS_WIN) -#include "base/scoped_handle_win.h" -#endif - class ScopedStdioHandle { public: ScopedStdioHandle() |