Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: chrome/browser/chromeos/tab_closeable_state_watcher.cc

Issue 9085006: Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac yet again Created 8 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/boot_times_loader.cc ('k') | chrome/browser/custom_home_pages_table_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/tab_closeable_state_watcher.cc
===================================================================
--- chrome/browser/chromeos/tab_closeable_state_watcher.cc (revision 116244)
+++ chrome/browser/chromeos/tab_closeable_state_watcher.cc (working copy)
@@ -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 @@
// 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 @@
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;
« no previous file with comments | « chrome/browser/chromeos/boot_times_loader.cc ('k') | chrome/browser/custom_home_pages_table_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698