Making some of ceee's dependencies on chrome_frame.gyp more explicit, and

adding explicit include_directories where they were previously implied
by direct dependency on a target with a direct_dependent_settings. This is
a candidate fix for today's build breaks.

BUG=none
TEST=it builds


Review URL: http://codereview.chromium.org/4994001

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

5 files changed, 28 insertions, 0 deletions

diff --git a/ceee/ie/broker/broker.gyp b/ceee/ie/broker/broker.gyp
index d5632a8..fbd2167f 100644
--- a/ceee/ie/broker/broker.gyp
+++ b/ceee/ie/broker/broker.gyp
@@ -59,6 +59,10 @@
         'window_events_funnel.cc',
         'window_events_funnel.h',
       ],
+      'include_dirs': [
+        # For chrome_tab.h
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
       'configurations': {
         'Debug': {
           'msvs_precompiled_source': '../common/precompile.cc',
@@ -89,6 +93,7 @@
         '../../../ceee/common/common.gyp:ceee_common',
         '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
         '<(DEPTH)/chrome_frame/chrome_frame.gyp:chrome_frame_ie',  # for GUIDs.
+        '<(DEPTH)/chrome_frame/chrome_frame.gyp:chrome_tab_idl',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
@@ -97,6 +102,10 @@
           'SubSystem': '2',
         },
       },
+      'include_dirs': [
+        # For version.h
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
       'libraries': [
         'oleacc.lib',
         'iepmapi.lib',
diff --git a/ceee/ie/common/common.gyp b/ceee/ie/common/common.gyp
index 7c42be7..9c08789 100644
--- a/ceee/ie/common/common.gyp
+++ b/ceee/ie/common/common.gyp
@@ -40,6 +40,8 @@
       ],
       'include_dirs': [
         '../../..',
+        # For chrome_tab.h
+        '<(SHARED_INTERMEDIATE_DIR)',
       ],
     },
     {
@@ -105,6 +107,10 @@
         '../../../chrome/common/extensions/user_script.cc',
         '../../../chrome/common/extensions/user_script.h',
       ],
+      'include_dirs': [
+        # For chrome_tab.h
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
       'direct_dependent_settings': {
         'include_dirs': [
           # Because we use some of the chrome files above directly, we need
diff --git a/ceee/ie/plugin/bho/bho.gyp b/ceee/ie/plugin/bho/bho.gyp
index fe773d39..850d5fb 100644
--- a/ceee/ie/plugin/bho/bho.gyp
+++ b/ceee/ie/plugin/bho/bho.gyp
@@ -21,6 +21,7 @@
         '../../../common/common.gyp:ceee_common',
         '../../../common/common.gyp:initializing_coclass',
         '../../../../base/base.gyp:base',
+        '../../../../chrome_frame/chrome_frame.gyp:chrome_tab_idl',
         # For the vtable patching stuff...
         '../../../../chrome_frame/chrome_frame.gyp:chrome_frame_ie',
       ],
@@ -76,6 +77,10 @@
         '../../../../chrome/common/extensions/extension_resource.cc',
         '../../../../chrome/common/extensions/extension_resource.h',
       ],
+      'include_dirs': [
+        # For chrome_tab.h
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
       'configurations': {
         'Debug': {
           'msvs_precompiled_source': '../../common/precompile.cc',
diff --git a/ceee/ie/plugin/toolband/toolband.gyp b/ceee/ie/plugin/toolband/toolband.gyp
index fd9df79..7019c85 100644
--- a/ceee/ie/plugin/toolband/toolband.gyp
+++ b/ceee/ie/plugin/toolband/toolband.gyp
@@ -29,6 +29,10 @@
         'oleacc.lib',
         'iepmapi.lib',
       ],
+      'include_dirs': [
+        # For chrome_tab.h
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
       'configurations': {
         'Debug': {
           'msvs_precompiled_source': '../../common/precompile.cc',
@@ -73,6 +77,8 @@
         # Allows us to include .tlb and .h files generated
         # from our .idl without undue trouble
         '$(IntDir)',
+        # For version.h
+        '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
diff --git a/ceee/installer_dll/ceee_installer_dll.gyp b/ceee/installer_dll/ceee_installer_dll.gyp
index 205ecba..a23e61d 100644
--- a/ceee/installer_dll/ceee_installer_dll.gyp
+++ b/ceee/installer_dll/ceee_installer_dll.gyp
@@ -25,6 +25,8 @@
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
+        # For version.h
+        '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
         'installer_helper.cc',