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/installer | |
| 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/installer')
| -rw-r--r-- | chrome/installer/DEPS | 1 | ||||
| -rw-r--r-- | chrome/installer/setup/install_worker.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/DEPS b/chrome/installer/DEPS index 730780b..104a0e3 100644 --- a/chrome/installer/DEPS +++ b/chrome/installer/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+chrome_frame", "+rlz", "+third_party/bspatch", "+third_party/lzma_sdk", diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index af8f919..b771ac3 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -35,8 +35,7 @@ #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/work_item_list.h" - -#include "chrome_tab.h" // NOLINT +#include "chrome_frame/chrome_tab.h" using base::win::RegKey; |