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
qweri0p · May 16, 2012 · f75b44c · f75b44c
1 parent b3dd766
commit f75b44c
Show file tree

Hide file tree

Showing 135 changed files with 138 additions and 129 deletions.
diff --git a/ash/ash.gyp b/ash/ash.gyp
@@ -328,7 +328,7 @@
         '../ui/aura/aura.gyp:test_support_aura',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/compositor/compositor.gyp:compositor_test_support',
-        '../ui/ui.gyp:gfx_resources',
+        '../ui/ui.gyp:native_theme_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
@@ -400,7 +400,7 @@
         'wm/workspace/workspace_manager_unittest.cc',
         'wm/workspace/workspace_window_resizer_unittest.cc',
 
-        '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
@@ -450,7 +450,7 @@
         '../ui/aura/aura.gyp:aura',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/compositor/compositor.gyp:compositor_test_support',
-        '../ui/ui.gyp:gfx_resources',
+        '../ui/ui.gyp:native_theme_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
@@ -487,7 +487,7 @@
         'shell/window_type_launcher.h',
         'shell/window_watcher.cc',
         'shell/window_watcher.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '../content/app/startup_helper_win.cc',

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
@@ -102,7 +102,7 @@
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',

diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
@@ -18,7 +18,7 @@
     'conditions': [
       ['OS != "mac" or use_aura==1', {
         'pak_inputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.pak',
         ]
       }],
       ['enable_extensions==1', {

diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
@@ -328,7 +328,7 @@
         '<(DEPTH)/content/content_resources.gyp:content_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
-        '<(DEPTH)/ui/ui.gyp:gfx_resources',
+        '<(DEPTH)/ui/ui.gyp:native_theme_resources',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',

diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py
@@ -130,7 +130,10 @@ def main():
     chrome_dir = os.path.join(src_dir, 'chrome')
     chrome_app_dir = os.path.join(chrome_dir, 'app')
     chrome_app_res_dir = os.path.join(chrome_app_dir, 'resources')
-    ui_base_dir = os.path.join(src_dir, 'ui', 'base', 'strings')
+    ui_base_dir = os.path.join(src_dir, 'ui', 'base',)
+    ui_base_strings_dir = os.path.join(ui_base_dir, 'strings')
+    ui_base_native_theme_dir =
+        os.path.join(ui_base_dir, 'native_theme', 'resources')
     grd_files = [
       os.path.join(ash_base_dir, 'ash_strings.grd'),
       os.path.join(chrome_app_dir, 'chromium_strings.grd'),
@@ -146,10 +149,10 @@ def main():
       os.path.join(chrome_dir, 'browser', 'resources', 'shared_resources.grd'),
       os.path.join(chrome_dir, 'common', 'common_resources.grd'),
       os.path.join(chrome_dir, 'renderer', 'renderer_resources.grd'),
-      os.path.join(src_dir, 'ui', 'gfx', 'gfx_resources.grd'),
       os.path.join(src_dir, 'ui', 'resources', 'ui_resources.grd'),
-      os.path.join(ui_base_dir, 'app_locale_settings.grd'),
-      os.path.join(ui_base_dir, 'ui_strings.grd'),
+      os.path.join(ui_base_native_theme_dir, 'native_theme_resources.grd'),
+      os.path.join(ui_base_strings_dir, 'app_locale_settings.grd'),
+      os.path.join(ui_base_strings_dir, 'ui_strings.grd'),
     ]
 
   # If no source directories were given, default them:

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
@@ -220,7 +220,7 @@
             'conditions': [
               ['OS != "mac"', {
                 'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.pak',
                 ]
               }],
             ],

diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
@@ -120,7 +120,7 @@
     "structures": [18000],
   },
 
-  "ui/gfx/gfx_resources.grd": {
+ "ui/base/native_theme/resources/native_theme_resources.grd": {
     "includes": [18500],
   },
 

diff --git a/ui/DEPS b/ui/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+grit/app_locale_settings.h",
-  "+grit/gfx_resources.h",
+  "+grit/native_theme_resources.h",
   "+grit/ui_resources_standard.h",
   "+grit/ui_strings.h",
   "+net",

diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
@@ -16,7 +16,7 @@
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../skia/skia.gyp:skia',
         '../compositor/compositor.gyp:compositor',
-        '../ui.gyp:gfx_resources',
+        '../ui.gyp:native_theme_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_2x',
@@ -203,7 +203,7 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../compositor/compositor.gyp:compositor',
         '../compositor/compositor.gyp:compositor_test_support',
-        '../ui.gyp:gfx_resources',
+        '../ui.gyp:native_theme_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'aura',
@@ -213,7 +213,7 @@
       ],
       'sources': [
         'demo/demo_main.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/base/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
     },
@@ -228,7 +228,7 @@
         '../compositor/compositor.gyp:compositor_test_support',
         '../compositor/compositor.gyp:compositor',
         '../gl/gl.gyp:gl',
-        '../ui.gyp:gfx_resources',
+        '../ui.gyp:native_theme_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'test_support_aura',
@@ -247,7 +247,7 @@
         'event_filter_unittest.cc',
         'event_unittest.cc',
         'window_unittest.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
       'conditions': [

diff --git 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
@@ -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
@@ -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
@@ -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>
+
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
@@ -61,7 +61,7 @@
           # TODO(sky): before we make this real need to remove
           # IDR_BITMAP_BRUSH_IMAGE.
           'dependencies': [
-            '<(DEPTH)/ui/ui.gyp:gfx_resources',
+            '<(DEPTH)/ui/ui.gyp:native_theme_resources',
             '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL',
             '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
           ],
@@ -123,7 +123,7 @@
         'test/test_suite.h',
         'test/test_utils.cc',
         'test/test_utils.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc'
       ],
       'conditions': [

diff --git a/ui/gfx/DEPS b/ui/gfx/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+base",
-  "+grit/gfx_resources.h",
   "+skia",
   "+third_party/angle",
 ]