summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/tab_closeable_state_watcher.cc16
-rw-r--r--chrome/browser/chromeos/tab_closeable_state_watcher.h8
-rw-r--r--chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc3
-rw-r--r--chrome/browser/chromeos/wm_overview_controller.cc38
4 files changed, 36 insertions, 29 deletions
diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.cc b/chrome/browser/chromeos/tab_closeable_state_watcher.cc
index e54f374..4972079 100644
--- a/chrome/browser/chromeos/tab_closeable_state_watcher.cc
+++ b/chrome/browser/chromeos/tab_closeable_state_watcher.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "chrome/browser/tab_contents_wrapper.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
@@ -36,24 +37,26 @@ TabCloseableStateWatcher::TabStripWatcher::~TabStripWatcher() {
// TabStripModelObserver implementation:
void TabCloseableStateWatcher::TabStripWatcher::TabInsertedAt(
- TabContents* tab_contents, int index, bool foreground) {
+ TabContentsWrapper* tab_contents, int index, bool foreground) {
main_watcher_->OnTabStripChanged(browser_, false);
}
void TabCloseableStateWatcher::TabStripWatcher::TabClosingAt(
- TabStripModel* tab_strip_model, TabContents* tab_contents, int index) {
+ TabStripModel* tab_strip_model,
+ TabContentsWrapper* tab_contents,
+ int index) {
// Check if the last tab is closing.
if (tab_strip_model->count() == 1)
main_watcher_->OnTabStripChanged(browser_, true);
}
void TabCloseableStateWatcher::TabStripWatcher::TabDetachedAt(
- TabContents* tab_contents, int index) {
+ TabContentsWrapper* tab_contents, int index) {
main_watcher_->OnTabStripChanged(browser_, false);
}
void TabCloseableStateWatcher::TabStripWatcher::TabChangedAt(
- TabContents* tab_contents, int index, TabChangeType change_type) {
+ TabContentsWrapper* tab_contents, int index, TabChangeType change_type) {
main_watcher_->OnTabStripChanged(browser_, false);
}
@@ -191,8 +194,9 @@ void TabCloseableStateWatcher::CheckAndUpdateState(
} else {
TabStripModel* tabstrip_model = browser_to_check->tabstrip_model();
if (tabstrip_model->count() == 1) {
- new_can_close = tabstrip_model->GetTabContentsAt(0)->GetURL() !=
- GURL(chrome::kChromeUINewTabURL); // Tab is not NewTabPage.
+ new_can_close =
+ tabstrip_model->GetTabContentsAt(0)->tab_contents()->GetURL() !=
+ GURL(chrome::kChromeUINewTabURL); // Tab is not NewTabPage.
} else {
new_can_close = true;
}
diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.h b/chrome/browser/chromeos/tab_closeable_state_watcher.h
index 4e028af..fde2669 100644
--- a/chrome/browser/chromeos/tab_closeable_state_watcher.h
+++ b/chrome/browser/chromeos/tab_closeable_state_watcher.h
@@ -114,13 +114,13 @@ class TabCloseableStateWatcher : public ::TabCloseableStateWatcher,
virtual ~TabStripWatcher();
// TabStripModelObserver implementation:
- virtual void TabInsertedAt(TabContents* contents, int index,
+ virtual void TabInsertedAt(TabContentsWrapper* contents, int index,
bool foreground);
virtual void TabClosingAt(TabStripModel* tab_strip_model,
- TabContents* contents,
+ TabContentsWrapper* contents,
int index);
- virtual void TabDetachedAt(TabContents* contents, int index);
- virtual void TabChangedAt(TabContents* contents, int index,
+ virtual void TabDetachedAt(TabContentsWrapper* contents, int index);
+ virtual void TabChangedAt(TabContentsWrapper* contents, int index,
TabChangeType change_type);
const Browser* browser() const {
diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc
index f94cfd0..6e23c0f 100644
--- a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc
+++ b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc
@@ -102,7 +102,8 @@ class NewTabObserver : public TabStripModelObserver {
}
private:
- virtual void TabInsertedAt(TabContents* contents, int index,
+ virtual void TabInsertedAt(TabContentsWrapper* contents,
+ int index,
bool foreground) {
MessageLoopForUI::current()->Quit();
}
diff --git a/chrome/browser/chromeos/wm_overview_controller.cc b/chrome/browser/chromeos/wm_overview_controller.cc
index 2d56e7b..8d373d8 100644
--- a/chrome/browser/chromeos/wm_overview_controller.cc
+++ b/chrome/browser/chromeos/wm_overview_controller.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/browser/tab_contents/thumbnail_generator.h"
+#include "chrome/browser/tab_contents_wrapper.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/views/frame/browser_view.h"
@@ -71,22 +72,22 @@ class BrowserListener : public TabStripModelObserver {
~BrowserListener();
// Begin TabStripModelObserver methods
- virtual void TabInsertedAt(TabContents* contents,
+ virtual void TabInsertedAt(TabContentsWrapper* contents,
int index,
bool foreground);
virtual void TabClosingAt(TabStripModel* tab_strip_model,
- TabContents* contents,
+ TabContentsWrapper* contents,
int index) {}
- virtual void TabDetachedAt(TabContents* contents, int index);
- virtual void TabMoved(TabContents* contents,
+ virtual void TabDetachedAt(TabContentsWrapper* contents, int index);
+ virtual void TabMoved(TabContentsWrapper* contents,
int from_index,
int to_index);
- virtual void TabChangedAt(TabContents* contents, int index,
+ virtual void TabChangedAt(TabContentsWrapper* contents, int index,
TabStripModelObserver::TabChangeType change_type);
virtual void TabStripEmpty();
- virtual void TabDeselectedAt(TabContents* contents, int index) {}
- virtual void TabSelectedAt(TabContents* old_contents,
- TabContents* new_contents,
+ virtual void TabDeselectedAt(TabContentsWrapper* contents, int index) {}
+ virtual void TabSelectedAt(TabContentsWrapper* old_contents,
+ TabContentsWrapper* new_contents,
int index,
bool user_gesture);
// End TabStripModelObserver methods
@@ -127,7 +128,7 @@ class BrowserListener : public TabStripModelObserver {
// Returns the tab contents from the tab model for this child at index.
TabContents* GetTabContentsAt(int index) const {
- return browser_->tabstrip_model()->GetTabContentsAt(index);
+ return browser_->tabstrip_model()->GetTabContentsAt(index)->tab_contents();
}
private:
// Calculate the size of a cell based on the browser window's size.
@@ -203,7 +204,7 @@ BrowserListener::~BrowserListener() {
browser_->tabstrip_model()->RemoveObserver(this);
}
-void BrowserListener::TabInsertedAt(TabContents* contents,
+void BrowserListener::TabInsertedAt(TabContentsWrapper* contents,
int index,
bool foreground) {
InsertSnapshot(index);
@@ -211,13 +212,13 @@ void BrowserListener::TabInsertedAt(TabContents* contents,
UpdateSelectedIndex(browser_->selected_index());
}
-void BrowserListener::TabDetachedAt(TabContents* contents, int index) {
+void BrowserListener::TabDetachedAt(TabContentsWrapper* contents, int index) {
ClearSnapshot(index);
UpdateSelectedIndex(browser_->selected_index());
RenumberSnapshots(index);
}
-void BrowserListener::TabMoved(TabContents* contents,
+void BrowserListener::TabMoved(TabContentsWrapper* contents,
int from_index,
int to_index) {
// Need to reorder tab in the snapshots list, and reset the window
@@ -232,13 +233,14 @@ void BrowserListener::TabMoved(TabContents* contents,
}
void BrowserListener::TabChangedAt(
- TabContents* contents,
+ TabContentsWrapper* contents,
int index,
TabStripModelObserver::TabChangeType change_type) {
if (change_type != TabStripModelObserver::LOADING_ONLY) {
- snapshots_[index].title->SetTitle(contents->GetTitle());
- snapshots_[index].title->SetUrl(contents->GetURL());
- snapshots_[index].fav_icon->SetFavIcon(contents->GetFavIcon());
+ snapshots_[index].title->SetTitle(contents->tab_contents()->GetTitle());
+ snapshots_[index].title->SetUrl(contents->tab_contents()->GetURL());
+ snapshots_[index].fav_icon->SetFavIcon(
+ contents->tab_contents()->GetFavIcon());
if (change_type != TabStripModelObserver::TITLE_NOT_LOADING)
ReloadSnapshot(index);
}
@@ -248,8 +250,8 @@ void BrowserListener::TabStripEmpty() {
snapshots_.clear();
}
-void BrowserListener::TabSelectedAt(TabContents* old_contents,
- TabContents* new_contents,
+void BrowserListener::TabSelectedAt(TabContentsWrapper* old_contents,
+ TabContentsWrapper* new_contents,
int index,
bool user_gesture) {
UpdateSelectedIndex(index);
generated by cgit v1.1 at 2025-05-03 17:12:52 +0000