Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Unified Diff: chrome_frame/test/chrome_frame_unittests.cc

Issue 343086: Don't switch to CF's active document for frames or iframes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/protocol_sink_wrap.cc ('k') | chrome_frame/test/data/chrome_frame_tester_helpers.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/chrome_frame_unittests.cc
===================================================================
--- chrome_frame/test/chrome_frame_unittests.cc (revision 30697)
+++ chrome_frame/test/chrome_frame_unittests.cc (working copy)
@@ -1281,6 +1281,16 @@
SimpleBrowserTest(IE, kReferrerMainTest, L"FullTab_ReferrerTest");
}
+const wchar_t kSubFrameTestPage[] = L"files/full_tab_sub_frame_main.html";
+TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_SubFrame) {
+ SimpleBrowserTest(IE, kSubFrameTestPage, L"sub_frame");
+}
+
+const wchar_t kSubIFrameTestPage[] = L"files/full_tab_sub_iframe_main.html";
+TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_SubIFrame) {
+ SimpleBrowserTest(IE, kSubIFrameTestPage, L"sub_frame");
+}
+
HRESULT LaunchIEAsComServer(IWebBrowser2** web_browser) {
if (!web_browser)
return E_INVALIDARG;
@@ -1340,7 +1350,7 @@
}
MOCK_METHOD7_WITH_CALLTYPE(__stdcall, OnBeforeNavigate2,
- HRESULT (IDispatch* dispatch,
+ HRESULT (IDispatch* dispatch, // NOLINT
VARIANT* url,
VARIANT* flags,
VARIANT* target_frame_name,
@@ -1349,17 +1359,18 @@
VARIANT_BOOL* cancel));
MOCK_METHOD2_WITH_CALLTYPE(__stdcall, OnNavigateComplete2,
- void (IDispatch* dispatch, VARIANT* url));
+ void (IDispatch* dispatch, // NOLINT
+ VARIANT* url));
MOCK_METHOD5_WITH_CALLTYPE(__stdcall, OnNewWindow3,
- void (IDispatch** dispatch,
+ void (IDispatch** dispatch, // NOLINT
VARIANT_BOOL* Cancel,
DWORD flags,
BSTR url_context,
BSTR url));
MOCK_METHOD5_WITH_CALLTYPE(__stdcall, OnNavigateError,
- void (IDispatch* dispatch,
+ void (IDispatch* dispatch, // NOLINT
VARIANT* url,
VARIANT* frame_name,
VARIANT* status_code,
« no previous file with comments | « chrome_frame/protocol_sink_wrap.cc ('k') | chrome_frame/test/data/chrome_frame_tester_helpers.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698