diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 22:28:14 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 22:28:14 +0000 |
| commit | a6e82fccc2b73736c7a99e6293c6dfc04c6957ae (patch) | |
| tree | bfd0f3eadbc4fd2e7c9212f6a432b6a947cced2c /chrome/browser/tab_contents | |
| parent | 8ceb44c74fc375df749b60acc6fc01b5327c6d18 (diff) | |
| download | chromium_src-a6e82fccc2b73736c7a99e6293c6dfc04c6957ae.zip chromium_src-a6e82fccc2b73736c7a99e6293c6dfc04c6957ae.tar.gz chromium_src-a6e82fccc2b73736c7a99e6293c6dfc04c6957ae.tar.bz2 | |
Make sure in-page navigations don't make the page actions disappear.
Also added unit test to catch future regressions.
BUG=35935
TEST=ExtensionBrowserTest.PageActionInPageNavigation
Review URL: http://codereview.chromium.org/660012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 98f463b..c3f70d6 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -1458,10 +1458,7 @@ void TabContents::DidNavigateMainFramePostCommit( // Clear all page actions, blocked content notifications and browser actions // for this tab, unless this is an in-page navigation. - url_canon::Replacements<char> replacements; - replacements.ClearRef(); - if (params.url.ReplaceComponents(replacements) != - params.referrer.ReplaceComponents(replacements)) { + if (!details.is_in_page) { ExtensionsService* service = profile()->GetExtensionsService(); if (service) { for (size_t i = 0; i < service->extensions()->size(); ++i) { |