diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 16:52:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 16:52:20 +0000 |
| commit | 6acde635328db851483aa3f5a13eba8a687fe29d (patch) | |
| tree | 966a1df295acd70d9e77209a538aa5201ebb330a /chrome/browser/chromeos/tab_closeable_state_watcher.cc | |
| parent | 908da49b07a50a4062c770be8e7fdf8dfe34517b (diff) | |
| download | chromium_src-6acde635328db851483aa3f5a13eba8a687fe29d.zip chromium_src-6acde635328db851483aa3f5a13eba8a687fe29d.tar.gz chromium_src-6acde635328db851483aa3f5a13eba8a687fe29d.tar.bz2 | |
Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9085006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/tab_closeable_state_watcher.cc')
| -rw-r--r-- | chrome/browser/chromeos/tab_closeable_state_watcher.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.cc b/chrome/browser/chromeos/tab_closeable_state_watcher.cc index 9b71e130..9d4c3d8 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher.cc @@ -12,9 +12,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/web_contents.h" namespace chromeos { @@ -117,7 +117,7 @@ bool TabCloseableStateWatcher::CanCloseTabs(const Browser* browser, // This is the main purpose of this method CanCloseTabs. for (size_t i = 0; i < indices->size(); ++i) { if ((*indices)[i] == 0) { - if (tabstrip_model->GetTabContentsAt(0)->tab_contents()->GetURL() == + if (tabstrip_model->GetTabContentsAt(0)->web_contents()->GetURL() == GURL(chrome::kChromeUINewTabURL)) { // First tab is NewTabPage. indices->erase(indices->begin() + i); // Don't close it. return false; @@ -243,7 +243,7 @@ void TabCloseableStateWatcher::CheckAndUpdateState( TabStripModel* tabstrip_model = browser_to_check->tabstrip_model(); if (tabstrip_model->count() == 1) { new_can_close = - tabstrip_model->GetTabContentsAt(0)->tab_contents()->GetURL() != + tabstrip_model->GetTabContentsAt(0)->web_contents()->GetURL() != GURL(chrome::kChromeUINewTabURL); // Tab is not NewTabPage. } else { new_can_close = true; |