summaryrefslogtreecommitdiffstats
path: root/gfx/icon_util.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 14:01:59 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 14:01:59 +0000
commit386581083c4bd6d392189b57b977b0733831036b (patch)
tree3b16fc40ed7012f867eea27ad6757893b9d7fc0d /gfx/icon_util.h
parent2558839a26e5a33f5ff00a8de14172775f201adc (diff)
downloadchromium_src-386581083c4bd6d392189b57b977b0733831036b.zip
chromium_src-386581083c4bd6d392189b57b977b0733831036b.tar.gz
chromium_src-386581083c4bd6d392189b57b977b0733831036b.tar.bz2
file_util: Get rid of file_util::AppendToPath in icon_util_unittest.cc
Use AppendASCII from FilePath API instead of the deprecated AppendToPath function. BUG=24672 TEST=trybots Signed-off-by: Thiago Farina <tfarina@chromium.org> Review URL: http://codereview.chromium.org/3046020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/icon_util.h')
-rw-r--r--gfx/icon_util.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/gfx/icon_util.h b/gfx/icon_util.h
index 7a1233e..80c81f6 100644
--- a/gfx/icon_util.h
+++ b/gfx/icon_util.h
@@ -12,8 +12,9 @@
#include "base/basictypes.h"
namespace gfx {
- class Size;
+class Size;
}
+class FilePath;
class SkBitmap;
///////////////////////////////////////////////////////////////////////////////
@@ -77,8 +78,11 @@ class IconUtil {
// the desired .ico file.
//
// The function returns true on success and false otherwise.
+ // TODO(tfarina): Deprecated version of the FilePath version below.
static bool CreateIconFileFromSkBitmap(const SkBitmap& bitmap,
const std::wstring& icon_file_name);
+ static bool CreateIconFileFromSkBitmap(const SkBitmap& bitmap,
+ const FilePath& icon_path);
private:
// The icon format is published in the MSDN but there is no definition of