| Index: content/shell/common/shell_content_client.cc
|
| diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc
|
| index a4388231518054e24d68bcd4dfd27da4d70fdbcb..9b9781d7eb993cf5ace561427acc769fd00f4f6c 100644
|
| --- a/content/shell/common/shell_content_client.cc
|
| +++ b/content/shell/common/shell_content_client.cc
|
| @@ -7,7 +7,6 @@
|
| #include "base/command_line.h"
|
| #include "base/strings/string_piece.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "blink/public/resources/grit/blink_resources.h"
|
| #include "content/app/resources/grit/content_resources.h"
|
| #include "content/app/strings/grit/content_strings.h"
|
| #include "content/public/common/content_switches.h"
|
| @@ -65,7 +64,7 @@ base::StringPiece ShellContentClient::GetDataResource(
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kRunLayoutTest)) {
|
| switch (resource_id) {
|
| - case IDR_BROKENIMAGE:
|
| + case IDR2_BROKENIMAGE:
|
| #if defined(OS_MACOSX)
|
| resource_id = IDR_CONTENT_SHELL_MISSING_IMAGE_PNG;
|
| #else
|
| @@ -73,7 +72,7 @@ base::StringPiece ShellContentClient::GetDataResource(
|
| #endif
|
| break;
|
|
|
| - case IDR_TEXTAREA_RESIZER:
|
| + case IDR2_TEXTAREA_RESIZER:
|
| resource_id = IDR_CONTENT_SHELL_TEXT_AREA_RESIZE_CORNER_PNG;
|
| break;
|
| }
|
|
|