| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 #include <windows.h> | 4 #include <windows.h> |
| 5 #include <stdarg.h> | 5 #include <stdarg.h> |
| 6 | 6 |
| 7 // IShellWindows includes. Unfortunately we can't keep these in | 7 // IShellWindows includes. Unfortunately we can't keep these in |
| 8 // alphabetic order since exdisp will bark if some interfaces aren't fully | 8 // alphabetic order since exdisp will bark if some interfaces aren't fully |
| 9 // defined. | 9 // defined. |
| 10 #include <mshtml.h> | 10 #include <mshtml.h> |
| (...skipping 1292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1303 int bugfix_version = 0; | 1303 int bugfix_version = 0; |
| 1304 | 1304 |
| 1305 base::SysInfo::OperatingSystemVersionNumbers(&major_version, &minor_version, | 1305 base::SysInfo::OperatingSystemVersionNumbers(&major_version, &minor_version, |
| 1306 &bugfix_version); | 1306 &bugfix_version); |
| 1307 if (major_version > 5) { | 1307 if (major_version > 5) { |
| 1308 DLOG(INFO) << __FUNCTION__ << " Not running test on Windows version: " | 1308 DLOG(INFO) << __FUNCTION__ << " Not running test on Windows version: " |
| 1309 << major_version; | 1309 << major_version; |
| 1310 return S_FALSE; | 1310 return S_FALSE; |
| 1311 } | 1311 } |
| 1312 | 1312 |
| 1313 IEVersion ie_version = GetIEVersion(); | |
| 1314 if (ie_version == IE_8) { | |
| 1315 DLOG(INFO) << __FUNCTION__ << " Not running test on IE8"; | |
| 1316 return S_FALSE; | |
| 1317 } | |
| 1318 | |
| 1319 EXPECT_TRUE(S_OK == LaunchIEAsComServer(web_browser2_.Receive())); | 1313 EXPECT_TRUE(S_OK == LaunchIEAsComServer(web_browser2_.Receive())); |
| 1320 web_browser2_->put_Visible(VARIANT_TRUE); | 1314 web_browser2_->put_Visible(VARIANT_TRUE); |
| 1321 | 1315 |
| 1322 HRESULT hr = sink->DispEventAdvise(web_browser2_, | 1316 HRESULT hr = sink->DispEventAdvise(web_browser2_, |
| 1323 &DIID_DWebBrowserEvents2); | 1317 &DIID_DWebBrowserEvents2); |
| 1324 EXPECT_TRUE(hr == S_OK); | 1318 EXPECT_TRUE(hr == S_OK); |
| 1325 | 1319 |
| 1326 VARIANT empty = ScopedVariant::kEmptyVariant; | 1320 VARIANT empty = ScopedVariant::kEmptyVariant; |
| 1327 ScopedVariant url; | 1321 ScopedVariant url; |
| 1328 url.Set(navigate_url.c_str()); | 1322 url.Set(navigate_url.c_str()); |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1501 return; | 1495 return; |
| 1502 | 1496 |
| 1503 ASSERT_TRUE(mock.web_browser2() != NULL); | 1497 ASSERT_TRUE(mock.web_browser2() != NULL); |
| 1504 | 1498 |
| 1505 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 1499 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 1506 | 1500 |
| 1507 mock.Uninitialize(); | 1501 mock.Uninitialize(); |
| 1508 chrome_frame_test::CloseAllIEWindows(); | 1502 chrome_frame_test::CloseAllIEWindows(); |
| 1509 } | 1503 } |
| 1510 | 1504 |
| OLD | NEW |