Revert 105803 - Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIATE_DIR, a globally common output folder. It's rude to dump things in the root of the dir that aren't used project-wide.

BUG=97185

TEST=Chrome Frame artifacts do not appear in e.g. build/Debug/obj/global_intermediate/



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



TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/8318013

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

13 files changed, 66 insertions, 34 deletions

diff --git a/chrome_frame/bho.h b/chrome_frame/bho.h
index 6afeb61..111eb04 100644
--- a/chrome_frame/bho.h
+++ b/chrome_frame/bho.h
@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include "chrome_frame/chrome_tab.h"
+#include "chrome_tab.h"  // NOLINT
 #include "chrome_frame/delete_chrome_history.h"
 #include "chrome_frame/resource.h"
 #include "chrome_frame/urlmon_moniker.h"
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index a377fcf..a2f4891a 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -62,7 +62,7 @@
       'type': 'none',
       'msvs_settings': {
         'VCMIDLTool': {
-          'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
+          'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)',
         },
       },
       'sources': [
@@ -89,7 +89,7 @@
         'locales/locales.gyp:*',
       ],
       'sources': [
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'chrome_frame_unittest_main.cc',
         'chrome_launcher.cc',
         'chrome_launcher.h',
@@ -249,7 +249,7 @@
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
         'chrome_launcher_version.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'test_utils.cc',
         'test_utils.h',
       ],
@@ -324,7 +324,7 @@
         '../chrome/test/base/chrome_process_util.cc',
         '../chrome/test/base/chrome_process_util.h',
         '../chrome/test/ui/ui_test.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/perf/chrome_frame_perftest.cc',
@@ -414,7 +414,7 @@
         'test/net/test_automation_provider.h',
         'test/net/test_automation_resource_message_filter.cc',
         'test/net/test_automation_resource_message_filter.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         'test_utils.cc',
         'test_utils.h',
@@ -485,7 +485,7 @@
         'test/simulate_input.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         '../base/test/test_file_util_win.cc',
         '../chrome/test/automation/proxy_launcher.cc',
         '../chrome/test/automation/proxy_launcher.h',
@@ -561,7 +561,7 @@
         'test/test_with_web_server.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'chrome_tab.idl',
         'renderer_glue.cc',
         'test_utils.cc',
@@ -570,6 +570,8 @@
       'include_dirs': [
         '<(DEPTH)/third_party/wtl/include',
         '<(DEPTH)/breakpad/src',
+        # To allow including "chrome_tab.h"
+        '<(INTERMEDIATE_DIR)',
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
@@ -625,7 +627,6 @@
       ],
       'include_dirs': [
         # To allow including "version.h"
-        # TODO(grt): remove this as per http://crbug.com/99368
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
@@ -674,7 +675,7 @@
         'chrome_protocol.cc',
         'chrome_protocol.h',
         'chrome_protocol.rgs',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'com_message_event.cc',
         'com_message_event.h',
         'com_type_info_holder.cc',
@@ -744,6 +745,7 @@
         '../third_party/active_doc/ole_document_impl.h',
       ],
       'include_dirs': [
+        '<(INTERMEDIATE_DIR)/../chrome_frame',
         '<(DEPTH)/third_party/wtl/include',
       ],
       'conditions': [
@@ -857,7 +859,7 @@
         'chrome_frame_reporting.h',
         'chrome_tab.cc',
         'chrome_tab.def',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
         #   figure out something more gyp-ish.
         'resources/tlb_resource.rc',
@@ -867,11 +869,9 @@
         'resource.h',
       ],
       'include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
-      ],
-      'resource_include_dirs': [
-        # To pick up chrome_tab.tlb
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame'
+        # For chrome_tab.h
+        '<(SHARED_INTERMEDIATE_DIR)',
+        '<(INTERMEDIATE_DIR)/../npchrome_frame',
       ],
       'conditions': [
         ['OS=="win"', {
diff --git a/chrome_frame/chrome_frame_activex.h b/chrome_frame/chrome_frame_activex.h
index 9fea94b..b2d677b 100644
--- a/chrome_frame/chrome_frame_activex.h
+++ b/chrome_frame/chrome_frame_activex.h
@@ -14,10 +14,12 @@
 #include <vector>
 
 #include "chrome_frame/chrome_frame_activex_base.h"
-#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/com_type_info_holder.h"
 #include "grit/chrome_frame_resources.h"
 
+// Include without path to make GYP build see it.
+#include "chrome_tab.h"  // NOLINT
+
 #define WM_HOST_MOVED_NOTIFICATION (WM_APP + 1)
 
 // ChromeFrameActivex: Implementation of the ActiveX control that is
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h
index 7e83727..500f9fa 100644
--- a/chrome_frame/chrome_frame_activex_base.h
+++ b/chrome_frame/chrome_frame_activex_base.h
@@ -28,7 +28,6 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/url_constants.h"
 #include "chrome_frame/chrome_frame_plugin.h"
-#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/com_message_event.h"
 #include "chrome_frame/com_type_info_holder.h"
 #include "chrome_frame/simple_resource_loader.h"
@@ -38,6 +37,9 @@
 #include "grit/generated_resources.h"
 #include "net/base/cookie_monster.h"
 
+// Include without path to make GYP build see it.
+#include "chrome_tab.h"  // NOLINT
+
 // Connection point class to support firing IChromeFrameEvents (dispinterface).
 template<class T>
 class ATL_NO_VTABLE ProxyDIChromeFrameEvents
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp
index 1fa61e7..87be09c 100644
--- a/chrome_frame/chrome_frame_launcher.gyp
+++ b/chrome_frame/chrome_frame_launcher.gyp
@@ -104,6 +104,11 @@
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
+      'include_dirs': [
+        # To allow including "chrome_tab.h"
+        '<(INTERMEDIATE_DIR)',
+        '<(INTERMEDIATE_DIR)/../chrome_frame',
+      ],
       'sources': [
         'chrome_frame_helper_main.cc',
         'chrome_frame_helper_version.rc',
@@ -128,13 +133,18 @@
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
+      'include_dirs': [
+        # To allow including "chrome_tab.h"
+        '<(INTERMEDIATE_DIR)',
+        '<(INTERMEDIATE_DIR)/../chrome_frame',
+      ],
       'sources': [
         'bho_loader.cc',
         'bho_loader.h',
         'chrome_frame_helper_dll.cc',
         'chrome_frame_helper_dll.def',
         'chrome_frame_helper_version.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'chrome_tab.idl',
         'event_hooker.cc',
         'event_hooker.h',
@@ -159,12 +169,17 @@
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
+      'include_dirs': [
+        # To allow including "chrome_tab.h"
+        '<(INTERMEDIATE_DIR)',
+        '<(INTERMEDIATE_DIR)/../chrome_frame',
+      ],
       'sources': [
         'chrome_frame_helper_util.cc',
         'chrome_frame_helper_util.h',
         'registry_watcher.cc',
         'registry_watcher.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'chrome_tab.idl',
         'iids.cc',
       ],
diff --git a/chrome_frame/chrome_protocol.h b/chrome_frame/chrome_protocol.h
index f89ac70..d98ca69 100644
--- a/chrome_frame/chrome_protocol.h
+++ b/chrome_frame/chrome_protocol.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,11 +7,12 @@
 
 #include <atlbase.h>
 #include <atlcom.h>
-
-#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/resource.h"
 #include "grit/chrome_frame_resources.h"
 
+// Include without path to make GYP build see it.
+#include "chrome_tab.h"  // NOLINT
+
 // ChromeProtocol
 class ATL_NO_VTABLE ChromeProtocol
     : public CComObjectRootEx<CComSingleThreadModel>,
diff --git a/chrome_frame/delete_chrome_history.h b/chrome_frame/delete_chrome_history.h
index 810f35f..947f673 100644
--- a/chrome_frame/delete_chrome_history.h
+++ b/chrome_frame/delete_chrome_history.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -14,9 +14,11 @@
 #include "base/message_loop.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/chrome_frame_plugin.h"
-#include "chrome_frame/chrome_tab.h"
 #include "grit/chrome_frame_resources.h"
 
+// Include without path to make GYP build see it.
+#include "chrome_tab.h"  // NOLINT
+
 class Bho;
 
 // DeleteChromeHistory: Implements IDeleteBrowsingHistory and
diff --git a/chrome_frame/html_private_window_impl.h b/chrome_frame/html_private_window_impl.h
index 18414b8..358df46 100644
--- a/chrome_frame/html_private_window_impl.h
+++ b/chrome_frame/html_private_window_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,7 +9,7 @@
 #include <atlcom.h>
 #include <mshtml.h>
 
-#include "chrome_frame/chrome_tab.h"
+#include "chrome_tab.h"  // NOLINT
 #include "chrome_frame/resource.h"
 #include "grit/chrome_frame_resources.h"
 
diff --git a/chrome_frame/html_window_impl.h b/chrome_frame/html_window_impl.h
index 2bce98c..2e76b93 100644
--- a/chrome_frame/html_window_impl.h
+++ b/chrome_frame/html_window_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,7 +9,7 @@
 #include <atlcom.h>
 #include <mshtml.h>
 
-#include "chrome_frame/chrome_tab.h"
+#include "chrome_tab.h"  // NOLINT
 #include "chrome_frame/resource.h"
 #include "grit/chrome_frame_resources.h"
 
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index ed4a379..329adba 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -20,11 +20,14 @@
 #include "base/test/test_reg_util_win.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
-#include "chrome_frame/chrome_tab.h"
+
 #include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test_utils.h"
 #include "chrome_frame/utils.h"
 
+// Include without path to make GYP build see it.
+#include "chrome_tab.h"  // NOLINT
+
 #include "gtest/gtest.h"
 
 // Needed for CreateFunctor.
diff --git a/chrome_frame/test/chrome_tab_mocks.h b/chrome_frame/test/chrome_tab_mocks.h
index feb488f..49e9809 100644
--- a/chrome_frame/test/chrome_tab_mocks.h
+++ b/chrome_frame/test/chrome_tab_mocks.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -7,9 +7,11 @@
 #ifndef CHROME_FRAME_TEST_CHROME_TAB_MOCKS_H_
 #define CHROME_FRAME_TEST_CHROME_TAB_MOCKS_H_
 
-#include "chrome_frame/chrome_tab.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+// Include without path to make GYP build see it.
+#include "chrome_tab.h"  // NOLINT
+
 namespace testing {
 
 class IChromeFramePrivilegedMockImpl : public IChromeFramePrivileged {
diff --git a/chrome_frame/test/ie_event_sink.h b/chrome_frame/test/ie_event_sink.h
index 2a0496d..1346e1c 100644
--- a/chrome_frame/test/ie_event_sink.h
+++ b/chrome_frame/test/ie_event_sink.h
@@ -11,10 +11,13 @@
 #include <string>
 
 #include "base/win/scoped_comptr.h"
-#include "chrome_frame/chrome_tab.h"
+
 #include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test_utils.h"
 
+// Include without path to make GYP build see it.
+#include "chrome_tab.h"  // NOLINT
+
 namespace chrome_frame_test {
 
 // Listener for all events from the IEEventSink, defined below. This includes
diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h
index 6110327..ce86117 100644
--- a/chrome_frame/test/test_with_web_server.h
+++ b/chrome_frame/test/test_with_web_server.h
@@ -13,12 +13,14 @@
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
-#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+// Include without path to make GYP build see it.
+#include "chrome_tab.h"  // NOLINT
+
 // Specifies the invocation method for CF.
 class CFInvocation {
  public: