Commit 1085e02a authored by tkent@chromium.org's avatar tkent@chromium.org

Fix input-speech related failures on DRT

Windows and Mac implementations lacked IDR_INPUT_SPEECH* handling.
This change fixes them by removing resource ID checking.

TEST=Some of LayoutTests/fast/speech/.
BUG=none
Review URL: http://codereview.chromium.org/6303017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72581 0039d316-1c4b-4281-b951-d872f2087c98
parent 5f601a38
...@@ -216,28 +216,10 @@ base::StringPiece GetDataResource(int resource_id) { ...@@ -216,28 +216,10 @@ base::StringPiece GetDataResource(int resource_id) {
} }
return resize_corner_data; return resize_corner_data;
} }
case IDR_SEARCH_CANCEL:
case IDR_SEARCH_CANCEL_PRESSED:
case IDR_SEARCH_MAGNIFIER:
case IDR_SEARCH_MAGNIFIER_RESULTS:
case IDR_MEDIA_PAUSE_BUTTON:
case IDR_MEDIA_PLAY_BUTTON:
case IDR_MEDIA_PLAY_BUTTON_DISABLED:
case IDR_MEDIA_SOUND_FULL_BUTTON:
case IDR_MEDIA_SOUND_NONE_BUTTON:
case IDR_MEDIA_SOUND_DISABLED:
case IDR_MEDIA_SLIDER_THUMB:
case IDR_MEDIA_VOLUME_SLIDER_THUMB: {
base::StringPiece res;
g_resource_data_pack->GetStringPiece(resource_id, &res);
return res;
}
default:
break;
} }
return base::StringPiece(); base::StringPiece res;
g_resource_data_pack->GetStringPiece(resource_id, &res);
return res;
} }
} // namespace webkit_glue } // namespace webkit_glue
...@@ -35,7 +35,7 @@ base::StringPiece GetRawDataResource(HMODULE module, int resource_id) { ...@@ -35,7 +35,7 @@ base::StringPiece GetRawDataResource(HMODULE module, int resource_id) {
: base::StringPiece(); : base::StringPiece();
} }
base::StringPiece NetResourceProvider(int key) { base::StringPiece ResourceProvider(int key) {
return GetRawDataResource(::GetModuleHandle(NULL), key); return GetRawDataResource(::GetModuleHandle(NULL), key);
} }
...@@ -99,27 +99,9 @@ base::StringPiece GetDataResource(int resource_id) { ...@@ -99,27 +99,9 @@ base::StringPiece GetDataResource(int resource_id) {
} }
return resize_corner_data; return resize_corner_data;
} }
case IDR_SEARCH_CANCEL:
case IDR_SEARCH_CANCEL_PRESSED:
case IDR_SEARCH_MAGNIFIER:
case IDR_SEARCH_MAGNIFIER_RESULTS:
case IDR_MEDIA_PAUSE_BUTTON:
case IDR_MEDIA_PLAY_BUTTON:
case IDR_MEDIA_PLAY_BUTTON_DISABLED:
case IDR_MEDIA_SOUND_FULL_BUTTON:
case IDR_MEDIA_SOUND_NONE_BUTTON:
case IDR_MEDIA_SOUND_DISABLED:
case IDR_MEDIA_SLIDER_THUMB:
case IDR_MEDIA_VOLUME_SLIDER_THUMB:
case IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS:
return NetResourceProvider(resource_id);
default:
break;
} }
return base::StringPiece(); return ResourceProvider(resource_id);
} }
} // namespace webkit_glue } // namespace webkit_glue
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment