diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 16:11:09 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 16:11:09 +0000 |
commit | b6e09acf8ced26198871626c76bb5a3741cc51f1 (patch) | |
tree | a4029d45393a1c34ba1b88d67c052512ad16c7eb /chrome/browser/tabs | |
parent | 2526315929de99fa5762583621fb52b626a62ef9 (diff) | |
download | chromium_src-b6e09acf8ced26198871626c76bb5a3741cc51f1.zip chromium_src-b6e09acf8ced26198871626c76bb5a3741cc51f1.tar.gz chromium_src-b6e09acf8ced26198871626c76bb5a3741cc51f1.tar.bz2 |
Move RenderViewHost management out of WebContents into a new
RenderViewHostManager object.
The goal for this patch is to change no logic or APIs, just move the code. So
there are some not very clean callback functions and no new unit tests for this
file (although is is still covered by the same WebContents unit tests). This
should make the actual cleanup in a later pass much easier to follow.
I changed the ordering of only a few operations (like WebContents shutdown), and checked that this shouldn't matter. I had to change the "source" for several notifications since they are no longer sent from the WebContents.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r-- | chrome/browser/tabs/tab_strip_model.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index c71c089d..2828d51 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -271,14 +271,15 @@ bool TabStripModel::TabHasUnloadListener(int index) { // in testing and then provide better test coverage for features // like "close other tabs". WebContents* web_contents = GetContentsAt(index)->AsWebContents(); - if (web_contents) + if (web_contents) { // If the WebContents is not connected yet, then there's no unload // handler we can fire even if the WebContents has an unload listener. // One case where we hit this is in a tab that has an infinite loop // before load. return web_contents->notify_disconnection() && - !web_contents->IsShowingInterstitialPage() && + !web_contents->showing_interstitial_page() && web_contents->render_view_host()->HasUnloadListener(); + } return false; } |