diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 18:13:16 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 18:13:16 +0000 |
| commit | 7965d2a9dc3d7667dc0b4561a7de87646ae83465 (patch) | |
| tree | e22bdbe44f051dc8934db8878f2661c7a2b2ee42 /chrome_frame | |
| parent | f9dc9fce765fa4077269f1ad3dee544fc6c3dcdf (diff) | |
| download | chromium_src-7965d2a9dc3d7667dc0b4561a7de87646ae83465.zip chromium_src-7965d2a9dc3d7667dc0b4561a7de87646ae83465.tar.gz chromium_src-7965d2a9dc3d7667dc0b4561a7de87646ae83465.tar.bz2 | |
Reverting this as this causes a message box to show up on the builders indicating that the
chrome and chrome frame versions are different which they are. Perhaps the version resource in
chrome frame is just wrong and needs a clobber.
Robert please investigate and reland
Revert 63211 - Re-add the version mismatch checking which was removed at some point. Also add version information to chrome_frame_tests.exe. This will be needed for subsequent tests.
Review URL: http://codereview.chromium.org/3879001
TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/3939002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 2 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index cde3108..6ac0b37 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -224,7 +224,6 @@ 'dependencies': [ '../base/base.gyp:test_support_base', '../build/temp_gyp/googleurl.gyp:googleurl', - '../chrome/chrome.gyp:chrome_version_header', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', '../chrome/chrome.gyp:browser', @@ -279,7 +278,6 @@ 'test/url_request_test.cc', 'test/win_event_receiver.cc', 'test/win_event_receiver.h', - 'chrome_launcher_version.rc', 'chrome_tab.h', 'chrome_tab.idl', 'test_utils.cc', diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 28362e5..7ee5950 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -265,10 +265,6 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, ChromeFrameAutomationProxyImpl* proxy = new ChromeFrameAutomationProxyImpl(this, params->launch_timeout()); - // Ensure that the automation proxy actually respects our choice on whether - // or not to check the version. - proxy->set_perform_version_check(params->version_check()); - // Launch browser scoped_ptr<CommandLine> command_line( chrome_launcher::CreateLaunchCommandLine()); |