diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 22:45:44 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 22:45:44 +0000 |
| commit | bb81f384b9ed7b1da8e2f703ced60dabc629309d (patch) | |
| tree | d179afc3124a548f16e847b2394c2f914d861ac4 /chrome/browser/prerender/prerender_contents.cc | |
| parent | 6dad490f3125744e012b974c01f9c911b8e4b519 (diff) | |
| download | chromium_src-bb81f384b9ed7b1da8e2f703ced60dabc629309d.zip chromium_src-bb81f384b9ed7b1da8e2f703ced60dabc629309d.tar.gz chromium_src-bb81f384b9ed7b1da8e2f703ced60dabc629309d.tar.bz2 | |
Convert the remaining Browser::GetSelectedTabContents() calls to GetSelectedWebContents, and update all dependent code.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9074012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_contents.cc')
| -rw-r--r-- | chrome/browser/prerender/prerender_contents.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 8ca50a2..6a04105 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -337,7 +337,7 @@ void PrerenderContents::StartPrerendering( // Register for new windows from any source. notification_registrar_.Add( this, content::NOTIFICATION_CREATING_NEW_WINDOW_CANCELLED, - content::Source<TabContents>(new_contents)); + content::Source<WebContents>(new_contents)); DCHECK(load_start_time_.is_null()); load_start_time_ = base::TimeTicks::Now(); @@ -470,8 +470,8 @@ void PrerenderContents::Observe(int type, case content::NOTIFICATION_CREATING_NEW_WINDOW_CANCELLED: { if (prerender_contents_.get()) { - CHECK(content::Source<TabContents>(source).ptr() == - prerender_contents_->tab_contents()); + CHECK(content::Source<WebContents>(source).ptr() == + prerender_contents_->web_contents()); // Since we don't want to permit child windows that would have a // window.opener property, terminate prerendering. Destroy(FINAL_STATUS_CREATE_NEW_WINDOW); |