Move ui/gfx/resources to ui/base/native_theme/resources

Step2.
- Move ui/gfx/gfx_resources.grd to ui/base/native_theme/native_theme_resources.grd
-Updated gyp/DEPS/py files to use new target.
-Removed old files.

I had to keep the gfx_resources.pak as DumpRendererTree depends on it. I'll update DumpRendererTree first and then remove copy of gfx_resources.pak.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10377155

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137527 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 90 insertions, 3 deletions

diff --git a/ui/base/native_theme/native_theme_android.cc b/ui/base/native_theme/native_theme_android.cc
index 56e0dea..a7c1097 100644
--- a/ui/base/native_theme/native_theme_android.cc
+++ b/ui/base/native_theme/native_theme_android.cc
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "grit/gfx_resources.h"
+#include "grit/native_theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
diff --git a/ui/base/native_theme/native_theme_aura.cc b/ui/base/native_theme/native_theme_aura.cc
index 56336c0..65a40ff 100644
--- a/ui/base/native_theme/native_theme_aura.cc
+++ b/ui/base/native_theme/native_theme_aura.cc
@@ -5,7 +5,7 @@
 #include "ui/base/native_theme/native_theme_aura.h"
 
 #include "base/logging.h"
-#include "grit/gfx_resources.h"
+#include "grit/native_theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
diff --git a/ui/base/native_theme/native_theme_base.cc b/ui/base/native_theme/native_theme_base.cc
index 4f86670..8cdd263 100644
--- a/ui/base/native_theme/native_theme_base.cc
+++ b/ui/base/native_theme/native_theme_base.cc
@@ -7,7 +7,7 @@
 #include <limits>
 
 #include "base/logging.h"
-#include "grit/gfx_resources.h"
+#include "grit/native_theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
diff --git a/ui/base/native_theme/resources/native_theme_resources.grd b/ui/base/native_theme/resources/native_theme_resources.grd
new file mode 100644
index 0000000..f54ef1c
--- /dev/null
+++ b/ui/base/native_theme/resources/native_theme_resources.grd
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="grit/native_theme_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="grit/native_theme_resources_map.cc" type="resource_map_source" />
+    <output filename="grit/native_theme_resources_map.h" type="resource_map_header" />
+    <!-- TODO(oshima): Remove gfx_resources.pak once DumpRenderTree.gyp
+         is updated. -->
+    <output filename="gfx_resources.pak" type="data_package" />
+    <output filename="native_theme_resources.pak" type="data_package" />
+    <output filename="native_theme_resources.rc" type="rc_all" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')">
+        <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="linux-checkbox-disabled-indeterminate.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_DISABLED_OFF" file="linux-checkbox-disabled-off.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_DISABLED_ON" file="linux-checkbox-disabled-on.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_INDETERMINATE" file="linux-checkbox-indeterminate.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_OFF" file="linux-checkbox-off.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_ON" file="linux-checkbox-on.png" type="BINDATA" />
+        <include name="IDR_RADIO_DISABLED_OFF" file="linux-radio-disabled-off.png" type="BINDATA" />
+        <include name="IDR_RADIO_DISABLED_ON" file="linux-radio-disabled-on.png" type="BINDATA" />
+        <include name="IDR_RADIO_OFF" file="linux-radio-off.png" type="BINDATA" />
+        <include name="IDR_RADIO_ON" file="linux-radio-on.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_BAR" file="linux-progress-bar.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_BORDER_LEFT" file="linux-progress-border-left.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_BORDER_RIGHT" file="linux-progress-border-right.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_VALUE" file="linux-progress-value.png" type="BINDATA" />
+      </if>
+
+      <!-- TODO(jamescook): Replace Linux images with Aura-specific ones. -->
+      <if expr="pp_ifdef('use_aura')">
+        <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="linux-checkbox-disabled-indeterminate.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_DISABLED_OFF" file="linux-checkbox-disabled-off.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_DISABLED_ON" file="linux-checkbox-disabled-on.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_INDETERMINATE" file="linux-checkbox-indeterminate.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_OFF" file="linux-checkbox-off.png" type="BINDATA" />
+        <include name="IDR_CHECKBOX_ON" file="linux-checkbox-on.png" type="BINDATA" />
+        <include name="IDR_RADIO_DISABLED_OFF" file="linux-radio-disabled-off.png" type="BINDATA" />
+        <include name="IDR_RADIO_DISABLED_ON" file="linux-radio-disabled-on.png" type="BINDATA" />
+        <include name="IDR_RADIO_OFF" file="linux-radio-off.png" type="BINDATA" />
+        <include name="IDR_RADIO_ON" file="linux-radio-on.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_BAR" file="linux-progress-bar.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_BORDER_LEFT" file="linux-progress-border-left.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_BORDER_RIGHT" file="linux-progress-border-right.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_VALUE" file="linux-progress-value.png" type="BINDATA" />
+
+        <include name="IDR_SCROLL_BASE_CORNER" file="scrollbar_base_normal_edge.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_CORNER_H" file="scrollbar_base_hot_edge.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER" file="scrollbar_base_horizontal_normal_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER_H" file="scrollbar_base_horizontal_hot_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT" file="scrollbar_base_horizontal_normal_left.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT_H" file="scrollbar_base_horizontal_hot_left.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT" file="scrollbar_base_horizontal_normal_right.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H" file="scrollbar_base_horizontal_hot_right.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM" file="scrollbar_base_vertical_normal_bottom.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM_H" file="scrollbar_base_vertical_hot_bottom.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_VERTICAL_CENTER" file="scrollbar_base_vertical_normal_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_VERTICAL_CENTER_H" file="scrollbar_base_vertical_hot_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_VERTICAL_TOP" file="scrollbar_base_vertical_normal_top.png" type="BINDATA" />
+        <include name="IDR_SCROLL_BASE_VERTICAL_TOP_H" file="scrollbar_base_vertical_hot_top.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER" file="scrollbar_thumb_horizontal_normal_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H" file="scrollbar_thumb_horizontal_hot_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P" file="scrollbar_thumb_horizontal_pressed_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT" file="scrollbar_thumb_horizontal_normal_left.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H" file="scrollbar_thumb_horizontal_hot_left.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P" file="scrollbar_thumb_horizontal_pressed_left.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT" file="scrollbar_thumb_horizontal_normal_right.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H" file="scrollbar_thumb_horizontal_hot_right.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P" file="scrollbar_thumb_horizontal_pressed_right.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM" file="scrollbar_thumb_vertical_normal_bottom.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H" file="scrollbar_thumb_vertical_hot_bottom.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P" file="scrollbar_thumb_vertical_pressed_bottom.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER" file="scrollbar_thumb_vertical_normal_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_H" file="scrollbar_thumb_vertical_hot_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_P" file="scrollbar_thumb_vertical_pressed_center.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_VERTICAL_TOP" file="scrollbar_thumb_vertical_normal_top.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_H" file="scrollbar_thumb_vertical_hot_top.png" type="BINDATA" />
+        <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_P" file="scrollbar_thumb_vertical_pressed_top.png" type="BINDATA" />
+      </if>
+    </includes>
+  </release>
+</grit>
+