diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 17:49:05 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 17:49:05 +0000 |
commit | 63597e4ebc117bb561b93f4d775d787120e6728a (patch) | |
tree | a4825625ef2ff06b339e56a30fa5ae80aea29160 /printing/image.h | |
parent | c48abb01ae7e295e283f190bd05270e835b8d37f (diff) | |
download | chromium_src-63597e4ebc117bb561b93f4d775d787120e6728a.zip chromium_src-63597e4ebc117bb561b93f4d775d787120e6728a.tar.gz chromium_src-63597e4ebc117bb561b93f4d775d787120e6728a.tar.bz2 |
Deprecate most of the remaining wstring file_util functions.
These still exist on Windows due to being used by the installer,
but by moving them into the Windows-only block we prevent them
from being used in new code. (I am already finding new code using
some of these! I am glad to be rid of them.)
BUG=24672
Review URL: http://codereview.chromium.org/2850042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/image.h')
-rw-r--r-- | printing/image.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/printing/image.h b/printing/image.h index ed2820b..5f4746d 100644 --- a/printing/image.h +++ b/printing/image.h @@ -9,21 +9,22 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/logging.h" #include "gfx/size.h" #include "printing/native_metafile.h" +class FilePath; + namespace printing { // Lightweight raw-bitmap management. The image, once initialized, is immutable. // The main purpose is testing image contents. class Image { public: - // Creates the image from the given filename on disk. Uses extension to + // Creates the image from the given file on disk. Uses extension to // defer file type. PNG and EMF (on Windows) currently supported. // If image loading fails size().IsEmpty() will be true. - explicit Image(const std::wstring& filename); + explicit Image(const FilePath& path); // Creates the image from the metafile. Deduces bounds based on bounds in // metafile. If loading fails size().IsEmpty() will be true. |