summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_activex_base.h
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 14:56:27 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 14:56:27 +0000
commitc6864137ab07105215f78f1d7a6826c71c7b8c34 (patch)
tree45891556a322bf65fb3707d80893be1664555cc9 /chrome_frame/chrome_frame_activex_base.h
parentd44e159ed4e83cdeb233bdcc55b3b38b00fe0837 (diff)
downloadchromium_src-c6864137ab07105215f78f1d7a6826c71c7b8c34.zip
chromium_src-c6864137ab07105215f78f1d7a6826c71c7b8c34.tar.gz
chromium_src-c6864137ab07105215f78f1d7a6826c71c7b8c34.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex_base.h')
-rw-r--r--chrome_frame/chrome_frame_activex_base.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h
index 500f9fa..7e83727 100644
--- a/chrome_frame/chrome_frame_activex_base.h
+++ b/chrome_frame/chrome_frame_activex_base.h
@@ -28,6 +28,7 @@
#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"
@@ -37,9 +38,6 @@
#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