(reland r156610)

add ash_resources.grd and necessary changes to use images in ash/resources

BUG=146034
TEST=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=156610

Review URL: https://codereview.chromium.org/10905242

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

7 files changed, 26 insertions, 2 deletions

diff --git a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
index ac73167..445a4bc 100644
--- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
@@ -18,9 +18,9 @@
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "content/public/browser/web_contents.h"
+#include "grit/ash_resources.h"
 #include "grit/generated_resources.h"  // Accessibility names
 #include "grit/theme_resources.h"
-#include "grit/ui_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/accessibility/accessible_view_state.h"
diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
index 5d61d82..0be6d62 100644
--- a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
+++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
@@ -7,9 +7,9 @@
 #include "base/debug/stack_trace.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "grit/ash_resources.h"
 #include "grit/generated_resources.h"  // Accessibility names
 #include "grit/theme_resources.h"
-#include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index adc9f08..530cfb1 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2202,6 +2202,8 @@
             ['include', '^browser/ui/webui/certificate_viewer_ui.h'],
           ],
           'dependencies': [
+            # aura uses some of ash resources.
+            '../ash/ash.gyp:ash_resources',
             '../ui/aura/aura.gyp:aura',
             '../ui/compositor/compositor.gyp:compositor',
           ],
diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi
index 8759593..da717c9 100644
--- a/chrome/chrome_repack_chrome_100_percent.gypi
+++ b/chrome/chrome_repack_chrome_100_percent.gypi
@@ -9,6 +9,13 @@
       '<(grit_out_dir)/theme_resources_100_percent.pak',
       '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
     ],
+    'conditions': [
+      ['use_aura==1', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_100_percent.pak',
+        ],
+      }],
+    ],
   },
   'inputs': [
     '<(repack_path)',
diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi
index 1d1da38..158b012 100644
--- a/chrome/chrome_repack_chrome_200_percent.gypi
+++ b/chrome/chrome_repack_chrome_200_percent.gypi
@@ -10,6 +10,13 @@
       '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
       '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak',
     ],
+    'conditions': [
+      ['use_aura==1', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_200_percent.pak',
+        ],
+      }],
+    ],
   },
   'inputs': [
     '<(repack_path)',
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 66f8a88..94075ef 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -301,6 +301,11 @@
         },
       ],
       'conditions': [
+        ['use_aura==1', {
+          'dependencies': [
+             '<(DEPTH)/ash/ash.gyp:ash_resources',
+          ],
+        }],
         ['OS != "mac"', {
           # Copy pak files to the product directory. These files will be picked
           # up by the following installer scripts:
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0d6431f..faff32d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2141,6 +2141,9 @@
           'sources': [
             'browser/ui/app_list/apps_model_builder_unittest.cc',
           ],
+          'dependencies': [
+            '../ash/ash.gyp:ash_resources',
+          ],
         }],
         ['use_aura==1', {
           'dependencies': [