Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Unified Diff: webkit/tools/test_shell/test_shell_win.cc

Issue 7698005: Move base/resource_util.* into base/win/ since it's windows specific. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/test_shell_platform_delegate_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell_win.cc
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index fbdd03cfff7e415235e0efc68fffcdea1799d3de..fa72f4f8c703c6c613ade78cddd770f8f6f2a86b 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -15,11 +15,11 @@
#include "base/file_util.h"
#include "base/message_loop.h"
#include "base/path_service.h"
-#include "base/resource_util.h"
#include "base/stack_container.h"
#include "base/string_piece.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
+#include "base/win/resource_util.h"
#include "breakpad/src/client/windows/handler/exception_handler.h"
#include "grit/webkit_resources.h"
#include "grit/webkit_chromium_resources.h"
@@ -131,8 +131,8 @@ FilePath GetResourcesFilePath() {
static base::StringPiece GetRawDataResource(HMODULE module, int resource_id) {
void* data_ptr;
size_t data_size;
- return base::GetDataResourceFromModule(module, resource_id, &data_ptr,
- &data_size)
+ return base::win::GetDataResourceFromModule(module, resource_id, &data_ptr,
+ &data_size)
? base::StringPiece(static_cast<char*>(data_ptr), data_size)
: base::StringPiece();
}
@@ -169,8 +169,8 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
DWORD num_fonts = 1;
void* font_ptr;
size_t font_size;
- if (base::GetDataResourceFromModule(::GetModuleHandle(NULL), IDR_AHEM_FONT,
- &font_ptr, &font_size)) {
+ if (base::win::GetDataResourceFromModule(::GetModuleHandle(NULL),
+ IDR_AHEM_FONT, &font_ptr, &font_size)) {
HANDLE rc = AddFontMemResourceEx(font_ptr, font_size, 0, &num_fonts);
DCHECK(rc != 0);
}
« no previous file with comments | « webkit/tools/test_shell/test_shell_platform_delegate_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698