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

7 files changed, 16 insertions, 1 deletions

diff --git a/chrome/app/chrome_resources.scons b/chrome/app/chrome_resources.scons
index fdb8436..0646487 100644
--- a/chrome/app/chrome_resources.scons
+++ b/chrome/app/chrome_resources.scons
@@ -28,6 +28,7 @@ if env.Bit('linux'):
        '$TARGET_ROOT/grit_derived_sources/debugger_resources.pak',
        '$TARGET_ROOT/grit_derived_sources/common_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)
diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc
index 4fb80c4..8c701a4 100644
--- a/webkit/glue/chromium_bridge_impl.cc
+++ b/webkit/glue/chromium_bridge_impl.cc
@@ -222,6 +222,14 @@ PassRefPtr<Image> ChromiumBridge::loadPlatformImageResource(const char* name) {
     resource_id = IDR_TICKMARK_DASH;
   } else if (!strcmp(name, "panIcon")) {
     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")) {
     if (webkit_glue::IsLayoutTestMode()) {
       RefPtr<Image> image = BitmapImage::create();
diff --git a/webkit/glue/resources/linux-checkbox-off.png b/webkit/glue/resources/linux-checkbox-off.png
new file mode 100644
index 0000000..15cc949
--- /dev/null
+++ b/webkit/glue/resources/linux-checkbox-off.png
diff --git a/webkit/glue/resources/linux-checkbox-on.png b/webkit/glue/resources/linux-checkbox-on.png
new file mode 100644
index 0000000..4c72e8a
--- /dev/null
+++ b/webkit/glue/resources/linux-checkbox-on.png
diff --git a/webkit/glue/resources/linux-radio-off.png b/webkit/glue/resources/linux-radio-off.png
new file mode 100644
index 0000000..6a60a70
--- /dev/null
+++ b/webkit/glue/resources/linux-radio-off.png
diff --git a/webkit/glue/resources/linux-radio-on.png b/webkit/glue/resources/linux-radio-on.png
new file mode 100644
index 0000000..cb47411
--- /dev/null
+++ b/webkit/glue/resources/linux-radio-on.png
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index 2970b70..b3acd7f 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -14,6 +14,12 @@
       <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_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_CELL" file="resources\cell.cur" type="CURSOR" />
@@ -34,4 +40,4 @@
       <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" />
     </includes>
   </release>
-</grit>
\ No newline at end of file
+</grit>