diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 14:14:45 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 14:14:45 +0000 |
| commit | ad1be15945ef4a8930cb123cd3a13996f14987fe (patch) | |
| tree | e24d0ec7db3ef045d1e0bc5714b5ec08539b55fb /chrome | |
| parent | 1c3d29bbd4e6f4ec5d1ace213d8701cc524f88c9 (diff) | |
| download | chromium_src-ad1be15945ef4a8930cb123cd3a13996f14987fe.zip chromium_src-ad1be15945ef4a8930cb123cd3a13996f14987fe.tar.gz chromium_src-ad1be15945ef4a8930cb123cd3a13996f14987fe.tar.bz2 | |
Fix find-in-page for popups.
BUG=80479
TEST=as in bug
Review URL: http://codereview.chromium.org/6905042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/browser.cc | 5 | ||||
| -rw-r--r-- | chrome/test/functional/PYAUTO_TESTS | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 4d1777e..eacaa70 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -2908,7 +2908,10 @@ void Browser::AddNewContents(TabContents* source, TabContentsWrapper* source_wrapper = NULL; BlockedContentTabHelper* source_blocked_content = NULL; - TabContentsWrapper* new_wrapper = new TabContentsWrapper(new_contents); + TabContentsWrapper* new_wrapper = + TabContentsWrapper::GetCurrentWrapperForContents(new_contents); + if (!new_wrapper) + new_wrapper = new TabContentsWrapper(new_contents); if (source) { source_wrapper = TabContentsWrapper::GetCurrentWrapperForContents(source); source_blocked_content = source_wrapper->blocked_content_tab_helper(); diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS index c0aa06f..3ff4185 100644 --- a/chrome/test/functional/PYAUTO_TESTS +++ b/chrome/test/functional/PYAUTO_TESTS @@ -41,8 +41,6 @@ 'bookmark_bar', 'bookmarks', 'browser', - # crbug.com/80479 - '-browser.BrowserTest.testKillAndReloadSharedProcess', 'browsing_data', 'codesign', 'content', |