diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
| commit | dcd5776135982012e99ea7b7030b3412f61235c7 (patch) | |
| tree | 2853a787d4c09e4a8417a0c74a312917a05dce08 /chrome/utility | |
| parent | 05ba8b8dd541632486513221795d45e4fe71b47f (diff) | |
| download | chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.zip chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.gz chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.bz2 | |
Reland "Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories."
The issue with the r90464 was that in the win shared build we build dlls and we
need BASE_API to export functions and symbols.
BUG=72317
TEST=None
TBR=rsesek@chromium.org,brettw@chromium.org
Review URL: http://codereview.chromium.org/7263009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility')
| -rw-r--r-- | chrome/utility/chrome_content_utility_client.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index 10c577d..2b00945 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/chrome/utility/chrome_content_utility_client.cc @@ -22,10 +22,10 @@ #include "webkit/glue/image_decoder.h" #if defined(OS_WIN) -#include "app/win/iat_patch_function.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" +#include "base/win/iat_patch_function.h" #include "base/win/scoped_handle.h" #include "content/common/content_switches.h" #include "content/common/sandbox_init_wrapper.h" @@ -193,7 +193,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 app::win::IATPatchFunction g_iat_patch_createdca; +static base::win::IATPatchFunction g_iat_patch_createdca; HDC WINAPI UtilityProcess_CreateDCAPatch(LPCSTR driver_name, LPCSTR device_name, LPCSTR output, @@ -207,7 +207,7 @@ HDC WINAPI UtilityProcess_CreateDCAPatch(LPCSTR driver_name, return CreateDCA(driver_name, device_name, output, init_data); } -static app::win::IATPatchFunction g_iat_patch_get_font_data; +static base::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); |