summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/base.gypi7
-rw-r--r--base/win/resource_util.cc (renamed from base/resource_util.cc)6
-rw-r--r--base/win/resource_util.h (renamed from base/resource_util.h)8
-rw-r--r--ui/base/resource/resource_bundle_win.cc14
-rw-r--r--ui/gfx/canvas_direct2d_unittest.cc6
-rw-r--r--webkit/support/platform_support_win.cc6
-rw-r--r--webkit/tools/test_shell/test_shell_platform_delegate_win.cc1
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc10
8 files changed, 29 insertions, 29 deletions
diff --git a/base/base.gypi b/base/base.gypi
index 9d66f90..32d0cd0 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -197,8 +197,6 @@
'rand_util.h',
'rand_util_posix.cc',
'rand_util_win.cc',
- 'resource_util.cc',
- 'resource_util.h',
'safe_strerror_posix.cc',
'safe_strerror_posix.h',
'scoped_ptr.h',
@@ -335,6 +333,8 @@
'win/object_watcher.h',
'win/registry.cc',
'win/registry.h',
+ 'win/resource_util.cc',
+ 'win/resource_util.h',
'win/scoped_bstr.cc',
'win/scoped_bstr.h',
'win/scoped_com_initializer.h',
@@ -542,9 +542,6 @@
}],
[ 'OS != "win"', {
'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
- 'sources!': [
- 'resource_util.cc',
- ],
},],
[ 'component=="shared_library"', {
'conditions': [
diff --git a/base/resource_util.cc b/base/win/resource_util.cc
index 7c7a519..de9f583 100644
--- a/base/resource_util.cc
+++ b/base/win/resource_util.cc
@@ -3,9 +3,10 @@
// found in the LICENSE file.
#include "base/logging.h"
-#include "base/resource_util.h"
+#include "base/win/resource_util.h"
namespace base {
+namespace win {
bool GetDataResourceFromModule(HMODULE module, int resource_id,
void** data, size_t* length) {
if (!module)
@@ -34,4 +35,5 @@ bool GetDataResourceFromModule(HMODULE module, int resource_id,
*length = static_cast<size_t>(data_size);
return true;
}
-} // namespace
+} // namespace win
+} // namespace base
diff --git a/base/resource_util.h b/base/win/resource_util.h
index 26d15cf..e4b82e5 100644
--- a/base/resource_util.h
+++ b/base/win/resource_util.h
@@ -5,8 +5,8 @@
// This file contains utility functions for accessing resources in external
// files (DLLs) or embedded in the executable itself.
-#ifndef BASE_RESOURCE_UTIL_H__
-#define BASE_RESOURCE_UTIL_H__
+#ifndef BASE_WIN_RESOURCE_UTIL_H__
+#define BASE_WIN_RESOURCE_UTIL_H__
#pragma once
#include <windows.h>
@@ -15,6 +15,7 @@
#include "base/basictypes.h"
namespace base {
+namespace win {
// Function for getting a data resource (BINDATA) from a dll. Some
// resources are optional, especially in unit tests, so this returns false
@@ -22,6 +23,7 @@ namespace base {
bool BASE_EXPORT GetDataResourceFromModule(HMODULE module, int resource_id,
void** data, size_t* length);
+} // namespace win
} // namespace base
-#endif // BASE_RESOURCE_UTIL_H__
+#endif // BASE_WIN_RESOURCE_UTIL_H__
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index 0024f5d..5778db2 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -9,9 +9,9 @@
#include "base/debug/stack_trace.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/resource_util.h"
#include "base/stl_util.h"
#include "base/string_piece.h"
+#include "base/win/resource_util.h"
#include "base/win/windows_version.h"
#include "ui/base/resource/data_pack.h"
#include "ui/gfx/font.h"
@@ -61,8 +61,8 @@ RefCountedStaticMemory* ResourceBundle::LoadResourceBytes(
DataHandle module, int resource_id) {
void* data_ptr;
size_t data_size;
- if (base::GetDataResourceFromModule(module, resource_id, &data_ptr,
- &data_size)) {
+ if (base::win::GetDataResourceFromModule(module, resource_id, &data_ptr,
+ &data_size)) {
return new RefCountedStaticMemory(
reinterpret_cast<const unsigned char*>(data_ptr), data_size);
} else {
@@ -83,10 +83,10 @@ base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) const {
void* data_ptr;
size_t data_size;
base::StringPiece data;
- if (base::GetDataResourceFromModule(resources_data_,
- resource_id,
- &data_ptr,
- &data_size)) {
+ if (base::win::GetDataResourceFromModule(resources_data_,
+ resource_id,
+ &data_ptr,
+ &data_size)) {
return base::StringPiece(static_cast<const char*>(data_ptr), data_size);
} else if (locale_resources_data_.get() &&
locale_resources_data_->GetStringPiece(resource_id, &data)) {
diff --git a/ui/gfx/canvas_direct2d_unittest.cc b/ui/gfx/canvas_direct2d_unittest.cc
index 740f766..05aa57d 100644
--- a/ui/gfx/canvas_direct2d_unittest.cc
+++ b/ui/gfx/canvas_direct2d_unittest.cc
@@ -10,7 +10,7 @@
#include "base/command_line.h"
#include "base/memory/ref_counted_memory.h"
#include "base/memory/scoped_ptr.h"
-#include "base/resource_util.h"
+#include "base/win/resource_util.h"
#include "grit/gfx_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/brush.h"
@@ -112,8 +112,8 @@ SkBitmap LoadBitmapFromResources(int resource_id) {
HINSTANCE resource_instance = GetModuleHandle(NULL);
void* data_ptr;
size_t data_size;
- if (base::GetDataResourceFromModule(resource_instance, resource_id, &data_ptr,
- &data_size)) {
+ if (base::win::GetDataResourceFromModule(resource_instance, resource_id,
+ &data_ptr, &data_size)) {
scoped_refptr<RefCountedMemory> memory(new RefCountedStaticMemory(
reinterpret_cast<const unsigned char*>(data_ptr), data_size));
if (!memory)
diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc
index 687ef0e..fb5126e 100644
--- a/webkit/support/platform_support_win.cc
+++ b/webkit/support/platform_support_win.cc
@@ -9,9 +9,9 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/resource_util.h"
#include "base/string16.h"
#include "base/string_piece.h"
+#include "base/win/resource_util.h"
#include "grit/webkit_chromium_resources.h"
#include "grit/webkit_resources.h"
@@ -29,8 +29,8 @@ FilePath GetResourceFilePath(const char* ascii_name) {
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();
}
diff --git a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
index 7a2088f..cb9c3da 100644
--- a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
+++ b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
@@ -9,7 +9,6 @@
#include "base/command_line.h"
#include "base/event_recorder.h"
-#include "base/resource_util.h"
#include "base/win/win_util.h"
#include "ui/gfx/native_theme_win.h"
#include "webkit/tools/test_shell/foreground_helper.h"
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index fbdd03c..fa72f4f 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);
}
generated by cgit v1.1 at 2025-02-11 13:34:30 +0000