summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame.gyp
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-31 15:05:02 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-31 15:05:02 +0000
commite67a73f47398a8d89a98abde04f3d4c7695a6d30 (patch)
treeae5652a01e709405ab8fc3c2887b0b96b38ca490 /chrome_frame/chrome_frame.gyp
parent22e1168491f768ae6ff20ded07b3063ac5fe34db (diff)
downloadchromium_src-e67a73f47398a8d89a98abde04f3d4c7695a6d30.zip
chromium_src-e67a73f47398a8d89a98abde04f3d4c7695a6d30.tar.gz
chromium_src-e67a73f47398a8d89a98abde04f3d4c7695a6d30.tar.bz2
When GCF is the default renderer, use Chrome's User-agent header instead of IE's.
TEST=Set IsDefaultRenderer to 1 (REG_DWORD) under the ChromeFrame registry key. Check if the User agent header in requests is the Chrome user agent. Then set the value to 0 and make sure the regular user-agent header is there. BUG=50788 Review URL: http://codereview.chromium.org/3130016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
-rw-r--r--chrome_frame/chrome_frame.gyp10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 13f61f1..fa11702 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -132,6 +132,7 @@
'chrome_launcher.h',
'chrome_launcher_unittest.cc',
'function_stub_unittest.cc',
+ 'renderer_glue.cc',
'test/chrome_frame_test_utils.h',
'test/chrome_frame_test_utils.cc',
'test/com_message_event_unittest.cc',
@@ -231,7 +232,7 @@
'chrome_frame_ie',
'chrome_frame_npapi',
'chrome_frame_strings',
- 'npchrome_frame',
+ 'npchrome_frame',
'xulrunner_sdk',
],
'sources': [
@@ -270,6 +271,7 @@
'test/win_event_receiver.h',
'chrome_tab.h',
'chrome_tab.idl',
+ 'renderer_glue.cc',
'test_utils.cc',
'test_utils.h',
],
@@ -311,6 +313,7 @@
'../base/base.gyp:test_support_base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/chrome.gyp:common',
+ '../chrome/chrome.gyp:debugger',
'../chrome/chrome.gyp:test_support_ui',
'../chrome/chrome.gyp:utility',
'../testing/gmock.gyp:gmock',
@@ -457,6 +460,7 @@
'dependencies': [
'../base/base.gyp:test_support_base',
'../chrome/chrome.gyp:browser',
+ '../chrome/chrome.gyp:debugger',
'../chrome/chrome.gyp:renderer',
'../chrome/chrome.gyp:test_support_common',
'../testing/gtest.gyp:gtest',
@@ -605,6 +609,7 @@
'../build/temp_gyp/googleurl.gyp:googleurl',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/bzip2/bzip2.gyp:bzip2',
+ '../webkit/support/webkit_support.gyp:webkit_user_agent',
],
'sources': [
'bho.cc',
@@ -759,12 +764,12 @@
'chrome_frame_utils',
'xulrunner_sdk',
'chrome_frame_launcher.gyp:chrome_launcher',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
'chrome_frame_launcher.gyp:chrome_frame_helper',
'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
'../chrome/chrome.gyp:chrome_version_header',
'../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:utility',
- '../build/temp_gyp/googleurl.gyp:googleurl',
],
'sources': [
'chrome_frame_npapi.rgs',
@@ -781,6 +786,7 @@
'resources/tlb_resource.rc',
'chrome_tab.rgs',
'chrome_tab_version.rc',
+ 'renderer_glue.cc',
'resource.h',
],
'include_dirs': [