diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 23:50:30 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 23:50:30 +0000 |
| commit | 6f7582fd31ff06faa0298ab6d530369256e9f20a (patch) | |
| tree | 7c00dc3ea6426ff5f2a8677603956a4efbebc801 /chrome/utility/utility_thread.cc | |
| parent | a82026e0a7c0b5f3672f92242d4180cc52328add (diff) | |
| download | chromium_src-6f7582fd31ff06faa0298ab6d530369256e9f20a.zip chromium_src-6f7582fd31ff06faa0298ab6d530369256e9f20a.tar.gz chromium_src-6f7582fd31ff06faa0298ab6d530369256e9f20a.tar.bz2 | |
Move iat_patch from base to app/win. Remove the functions from the header since
they aren't used, and just make them local to the .cc file. Rename the .cc file
to iat_patch_function to match the class definition. Put it in the app::win
namespace to match the directories. Update callers.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3743006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility/utility_thread.cc')
| -rw-r--r-- | chrome/utility/utility_thread.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/utility/utility_thread.cc b/chrome/utility/utility_thread.cc index 4392557..81e7ff4 100644 --- a/chrome/utility/utility_thread.cc +++ b/chrome/utility/utility_thread.cc @@ -7,11 +7,9 @@ #include <vector> #include "base/file_util.h" -#if defined(OS_WIN) -#include "base/iat_patch.h" -#endif #include "base/path_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/common/child_process.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_unpacker.h" @@ -25,9 +23,13 @@ #include "printing/page_range.h" #include "printing/units.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h" #include "webkit/glue/idb_bindings.h" #include "webkit/glue/image_decoder.h" -#include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h" + +#if defined(OS_WIN) +#include "app/win/iat_patch_function.h" +#endif namespace { @@ -156,7 +158,7 @@ typedef bool (*GetPDFDocInfoProc)(const unsigned char* pdf_buffer, // The 2 below IAT patch functions are almost identical to the code in // render_process_impl.cc. This is needed to work around specific Windows APIs // used by the Chrome PDF plugin that will fail in the sandbox. -static iat_patch::IATPatchFunction g_iat_patch_createdca; +static app::win::IATPatchFunction g_iat_patch_createdca; HDC WINAPI UtilityProcess_CreateDCAPatch(LPCSTR driver_name, LPCSTR device_name, LPCSTR output, @@ -170,7 +172,7 @@ HDC WINAPI UtilityProcess_CreateDCAPatch(LPCSTR driver_name, return CreateDCA(driver_name, device_name, output, init_data); } -static iat_patch::IATPatchFunction g_iat_patch_get_font_data; +static app::win::IATPatchFunction g_iat_patch_get_font_data; DWORD WINAPI UtilityProcess_GetFontDataPatch( HDC hdc, DWORD table, DWORD offset, LPVOID buffer, DWORD length) { int rv = GetFontData(hdc, table, offset, buffer, length); |