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_protocol.h | |
| 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_protocol.h')
| -rw-r--r-- | chrome_frame/chrome_protocol.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome_frame/chrome_protocol.h b/chrome_frame/chrome_protocol.h index d98ca69..f89ac70 100644 --- a/chrome_frame/chrome_protocol.h +++ b/chrome_frame/chrome_protocol.h @@ -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. @@ -7,12 +7,11 @@ #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>, |