diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:47:23 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:47:23 +0000 |
| commit | f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4 (patch) | |
| tree | 150c11094e8caceea5f315df11bcf6073e1e1f45 /chrome_frame/chrome_protocol.h | |
| parent | 26be3c7afc6c1ab32edd302ff13c61530ee88c34 (diff) | |
| download | chromium_src-f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4.zip chromium_src-f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4.tar.gz chromium_src-f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4.tar.bz2 | |
Revert 105803 - 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
TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/8318013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105823 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, 4 insertions, 3 deletions
diff --git a/chrome_frame/chrome_protocol.h b/chrome_frame/chrome_protocol.h index f89ac70..d98ca69 100644 --- a/chrome_frame/chrome_protocol.h +++ b/chrome_frame/chrome_protocol.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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,11 +7,12 @@ #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>, |