diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-13 01:27:22 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-13 01:27:22 +0000 |
| commit | e33f99a191db9341991d5b42f4da594d1ed15e3a (patch) | |
| tree | f881998c37a1a2eb1e45852864eeda1d7f50d81e /chrome_frame/chrome_active_document.cc | |
| parent | 92ff337e2bb148581011ddf6c8d14d3ace50d626 (diff) | |
| download | chromium_src-e33f99a191db9341991d5b42f4da594d1ed15e3a.zip chromium_src-e33f99a191db9341991d5b42f4da594d1ed15e3a.tar.gz chromium_src-e33f99a191db9341991d5b42f4da594d1ed15e3a.tar.bz2 | |
IE would not switch into ChromeFrame if the url being navigated to had an anchor. The IsTopLevelUrl function exposed by the navigation manager
would compare the URL received in the BHO which has the anchor and the URL received from the anchor which does not have the anchor. As a result
we would not wrap the bind status callback which caused this issue.
The IsTopLevelUrl function now compares the URLs after stripping the anchor portion in the URL.
Should fix bug http://code.google.com/p/chromium/issues/detail?id=38265.
This only works if the moniker patch is enabled.
Bug=38265
Test=Covered by unit test.
Review URL: http://codereview.chromium.org/1559027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.cc')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index dae11b3..40be889 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -237,12 +237,7 @@ STDMETHODIMP ChromeActiveDocument::Load(BOOL fully_avalable, // from the moniker does not contain the anchor. To workaround // this we retrieve the URL from our BHO. std::wstring url(GetActualUrlFromMoniker( - moniker_name, bind_context, - mgr ? mgr->original_url_with_fragment() : std::wstring())); - - if (mgr) { - mgr->set_original_url_with_fragment(L""); - } + moniker_name, bind_context, mgr ? mgr->url(): std::wstring())); // The is_new_navigation variable indicates if this a navigation initiated // by typing in a URL for e.g. in the IE address bar, or from Chrome by |