summaryrefslogtreecommitdiffstats
path: root/chrome_frame/resources
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 15:37:33 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 15:37:33 +0000
commit8ca280e9a3c5df4013776bb8d0218b44a092f6ea (patch)
tree068aac125e5b267d17dc8c87c915b8f7f2fa6848 /chrome_frame/resources
parent8f323d604253480c1be59a74f05f7df528274c27 (diff)
downloadchromium_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/resources')
-rw-r--r--chrome_frame/resources/tlb_resource.rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/resources/tlb_resource.rc b/chrome_frame/resources/tlb_resource.rc
index 1267413..2b44b9a 100644
--- a/chrome_frame/resources/tlb_resource.rc
+++ b/chrome_frame/resources/tlb_resource.rc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -35,4 +35,4 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
// Generated from the TEXTINCLUDE 3 resource.
//
-1 TYPELIB "chrome_tab.tlb"
+1 TYPELIB "chrome_frame/chrome_tab.tlb"