diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 15:37:33 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 15:37:33 +0000 |
| commit | 8ca280e9a3c5df4013776bb8d0218b44a092f6ea (patch) | |
| tree | 068aac125e5b267d17dc8c87c915b8f7f2fa6848 /chrome_frame/chrome_tab.cc | |
| parent | 8f323d604253480c1be59a74f05f7df528274c27 (diff) | |
| download | chromium_src-8ca280e9a3c5df4013776bb8d0218b44a092f6ea.zip chromium_src-8ca280e9a3c5df4013776bb8d0218b44a092f6ea.tar.gz chromium_src-8ca280e9a3c5df4013776bb8d0218b44a092f6ea.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.
Also explicitly list the installer -> ChromeFrame dependency in src\chrome\installer\DEPS. It was already present but now check_deps catches it due to the correctly formatted include path.Remove several redundant instances of SHARED_INTERMEDIATE_DIR being added to the include lists.
BUG=97185
TEST=Chrome Frame artifacts do not appear in e.g. build/Debug/obj/global_intermediate/
Review URL: http://codereview.chromium.org/8317018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_tab.cc')
| -rw-r--r-- | chrome_frame/chrome_tab.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index 86de19e..1a8df60 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -4,8 +4,8 @@ // chrome_tab.cc : Implementation of DLL Exports. -// Include without path to make GYP build see it. -#include "chrome_tab.h" // NOLINT +// Need to include this before the ATL headers below. +#include "chrome_frame/chrome_tab.h" #include <atlsecurity.h> #include <objbase.h> |