Commit 75419b62 authored by agl@chromium.org's avatar agl@chromium.org

Linux: first part of removing GTK from the renderer

This patch adds the resources which the WebKit changes need. This
shouldn't change anything.

Review URL: http://codereview.chromium.org/27255


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10567 0039d316-1c4b-4281-b951-d872f2087c98
parent 5a1478c1
...@@ -28,6 +28,7 @@ if env.Bit('linux'): ...@@ -28,6 +28,7 @@ if env.Bit('linux'):
'$TARGET_ROOT/grit_derived_sources/debugger_resources.pak', '$TARGET_ROOT/grit_derived_sources/debugger_resources.pak',
'$TARGET_ROOT/grit_derived_sources/common_resources.pak', '$TARGET_ROOT/grit_derived_sources/common_resources.pak',
'$TARGET_ROOT/grit_derived_sources/renderer_resources.pak', '$TARGET_ROOT/grit_derived_sources/renderer_resources.pak',
'$TARGET_ROOT/grit_derived_sources/webkit_resources.pak',
] ]
) )
i = env.Install('$DESTINATION_ROOT', chrome_pak) i = env.Install('$DESTINATION_ROOT', chrome_pak)
......
...@@ -222,6 +222,14 @@ PassRefPtr<Image> ChromiumBridge::loadPlatformImageResource(const char* name) { ...@@ -222,6 +222,14 @@ PassRefPtr<Image> ChromiumBridge::loadPlatformImageResource(const char* name) {
resource_id = IDR_TICKMARK_DASH; resource_id = IDR_TICKMARK_DASH;
} else if (!strcmp(name, "panIcon")) { } else if (!strcmp(name, "panIcon")) {
resource_id = IDR_PAN_SCROLL_ICON; resource_id = IDR_PAN_SCROLL_ICON;
} else if (!strcmp(name, "linuxCheckboxOff")) {
resource_id = IDR_LINUX_CHECKBOX_OFF;
} else if (!strcmp(name, "linuxCheckboxOn")) {
resource_id = IDR_LINUX_CHECKBOX_ON;
} else if (!strcmp(name, "linuxRadioOff")) {
resource_id = IDR_LINUX_RADIO_OFF;
} else if (!strcmp(name, "linuxRadioOn")) {
resource_id = IDR_LINUX_RADIO_ON;
} else if (!strcmp(name, "deleteButton")) { } else if (!strcmp(name, "deleteButton")) {
if (webkit_glue::IsLayoutTestMode()) { if (webkit_glue::IsLayoutTestMode()) {
RefPtr<Image> image = BitmapImage::create(); RefPtr<Image> image = BitmapImage::create();
......
...@@ -14,6 +14,12 @@ ...@@ -14,6 +14,12 @@
<include name="IDR_FEED_PREVIEW" file="resources\feed.html" type="BINDATA" /> <include name="IDR_FEED_PREVIEW" file="resources\feed.html" type="BINDATA" />
<include name="IDR_PAN_SCROLL_ICON" file="resources\pan_icon.png" type="BINDATA" /> <include name="IDR_PAN_SCROLL_ICON" file="resources\pan_icon.png" type="BINDATA" />
<include name="IDR_TEXTAREA_RESIZER" file="resources\textarea_resize_corner.png" type="BINDATA" /> <include name="IDR_TEXTAREA_RESIZER" file="resources\textarea_resize_corner.png" type="BINDATA" />
<if expr="os == 'linux2'">
<include name="IDR_LINUX_CHECKBOX_OFF" file="resources\linux-checkbox-off.png" type="BINDATA" />
<include name="IDR_LINUX_CHECKBOX_ON" file="resources\linux-checkbox-on.png" type="BINDATA" />
<include name="IDR_LINUX_RADIO_OFF" file="resources\linux-radio-off.png" type="BINDATA" />
<include name="IDR_LINUX_RADIO_ON" file="resources\linux-radio-on.png" type="BINDATA" />
</if>
<include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" /> <include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" />
<include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" /> <include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" />
...@@ -34,4 +40,4 @@ ...@@ -34,4 +40,4 @@
<include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" /> <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" />
</includes> </includes>
</release> </release>
</grit> </grit>
\ No newline at end of file
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