diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 00:03:03 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 00:03:03 +0000 |
| commit | b731a1476cd4a9380902463e467bfdcc0c2a9cca (patch) | |
| tree | 7aa2f03c3804ed816a9d23dd0af645d790d9bcfd /chrome_frame/chrome_frame.gyp | |
| parent | 8ef47724cb5177e01b85e500bc8a8603874dc8cc (diff) | |
| download | chromium_src-b731a1476cd4a9380902463e467bfdcc0c2a9cca.zip chromium_src-b731a1476cd4a9380902463e467bfdcc0c2a9cca.tar.gz chromium_src-b731a1476cd4a9380902463e467bfdcc0c2a9cca.tar.bz2 | |
Fix the chrome frame context menu back forward test which regressed in revision 47187 due to a change in the context
menu resource ids.
Solution is to include the chrome_dll_resources.h file in a way to reduce conflicts with existing chrome frame resources.
We have two new files chrome_imported_resources.cc/.h to achieve that.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=44134
Bug=44134
Review URL: http://codereview.chromium.org/2067006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index d47348a..2f8f19f 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -641,6 +641,8 @@ 'chrome_frame_histograms.h', 'chrome_frame_reporting.cc', 'chrome_frame_reporting.h', + 'chrome_imported_resources.cc', + 'chrome_imported_resources.h', 'chrome_protocol.cc', 'chrome_protocol.h', 'chrome_protocol.rgs', |