Grit cleanup

- Fixup the chrome_strings target to default to a none target and let windows
  override it for it's hack.
- Make grit_target check _type to see how to auto add the header directory so
  it has a higher chance of being right in case things are done on real targets.

BUG=22247
TEST=everything still builds
Review URL: http://codereview.chromium.org/6756008

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

build/grit_target.gypi

@@ -10,12 +10,22 @@
 # NOTE: This file is optional, not all targets that use grit include it, some
 # do their own custom directives instead.
 {
-  'direct_dependent_settings': {
-    'include_dirs': [
-      '<(grit_out_dir)',
-    ],
-  },
   'conditions': [
+    # If the target is a direct binary, it needs to be able to find the header,
+    # otherwise it probably a supporting target just for grit so the include
+    # dir needs to be set on anything that depends on this action.
+    ['_type=="executable" or _type=="shared_library" or \
+      _type=="loadable_module" or _type=="static_library"', {
+      'include_dirs': [
+        '<(grit_out_dir)',
+      ],
+    }, {
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(grit_out_dir)',
+        ],
+      },
+    }],
     ['OS=="win"', {
       'dependencies': ['<(DEPTH)/build/win/system.gyp:cygwin'],
     }],

chrome/chrome.gyp

@@ -178,6 +178,7 @@
       # generated headers.
       'target_name': 'chrome_strings',
       'msvs_guid': 'D9DDAF60-663F-49CC-90DC-3D08CC3D1B28',
+      'type': 'none',
       'conditions': [
         ['OS=="win"', {
           # HACK(nsylvain): We want to enforce a fake dependency on
@@ -188,8 +189,6 @@
           # will always get built before installer_util.
           'type': 'dummy_executable',
           'dependencies': ['installer_util_strings'],
-        }, {
-          'type': 'none',
         }],
       ],
       'actions': [