| Index: webkit/support/platform_support_win.cc
|
| diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc
|
| index fb5126e5796d4d19eed640f13ffa5850c47bba71..94c3b2d44d1f4e87e7d6478b264d6d924f9bec2f 100644
|
| --- a/webkit/support/platform_support_win.cc
|
| +++ b/webkit/support/platform_support_win.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/win/resource_util.h"
|
| #include "grit/webkit_chromium_resources.h"
|
| #include "grit/webkit_resources.h"
|
| +#include "webkit/support/test_webkit_platform_support.h"
|
|
|
| #define MAX_LOADSTRING 100
|
|
|
| @@ -60,9 +61,7 @@ void AfterShutdown() {
|
|
|
| } // namespace webkit_support
|
|
|
| -namespace webkit_glue {
|
| -
|
| -string16 GetLocalizedString(int message_id) {
|
| +string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
|
| wchar_t localized[MAX_LOADSTRING];
|
| int length = ::LoadString(::GetModuleHandle(NULL), message_id,
|
| localized, MAX_LOADSTRING);
|
| @@ -73,7 +72,7 @@ string16 GetLocalizedString(int message_id) {
|
| return string16(localized, length);
|
| }
|
|
|
| -base::StringPiece GetDataResource(int resource_id) {
|
| +base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
|
| switch (resource_id) {
|
| case IDR_BROKENIMAGE: {
|
| // Use webkit's broken image icon (16x16)
|
| @@ -103,5 +102,3 @@ base::StringPiece GetDataResource(int resource_id) {
|
|
|
| return ResourceProvider(resource_id);
|
| }
|
| -
|
| -} // namespace webkit_glue
|
|
|