diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-09 16:32:20 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-09 16:32:20 +0000 |
| commit | b90d7e80c20c7c20831bedfe3fa6028ddab1ae95 (patch) | |
| tree | 308e927055c27a533019d329a9677ce8e7c53e33 /gfx | |
| parent | d716d4178136a223e9e79b3508c755a71108a068 (diff) | |
| download | chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.zip chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.gz chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.bz2 | |
Reland "Remove base/scoped_handle_win.h."
Fixed the problem with rlz library. Now should be fine to land this again.
This reverts commit 3620d9501af7bff688862c54fdd60f7eb41797f3.
Original Review URL: http://codereview.chromium.org/6126002/
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6110005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/icon_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gfx/icon_util.cc b/gfx/icon_util.cc index 6a4e51c..cabc505 100644 --- a/gfx/icon_util.cc +++ b/gfx/icon_util.cc @@ -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. @@ -6,8 +6,8 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/scoped_handle.h" #include "base/scoped_ptr.h" +#include "base/win/scoped_handle.h" #include "gfx/size.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -197,7 +197,7 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap, return false; // We start by creating the file. - ScopedHandle icon_file(::CreateFile(icon_path.value().c_str(), + base::win::ScopedHandle icon_file(::CreateFile(icon_path.value().c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL)); if (icon_file.Get() == INVALID_HANDLE_VALUE) |