diff options
Diffstat (limited to 'chrome/browser/automation')
3 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 46b44706..2cefa30 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -38,6 +38,7 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" +#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/translate/page_translated_details.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/browser.h" @@ -374,13 +375,14 @@ TabCountChangeObserver::~TabCountChangeObserver() { tab_strip_model_->RemoveObserver(this); } -void TabCountChangeObserver::TabInsertedAt(TabContents* contents, +void TabCountChangeObserver::TabInsertedAt(TabContentsWrapper* contents, int index, bool foreground) { CheckTabCount(); } -void TabCountChangeObserver::TabDetachedAt(TabContents* contents, int index) { +void TabCountChangeObserver::TabDetachedAt(TabContentsWrapper* contents, + int index) { CheckTabCount(); } diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index cfa6e14..9783a6a 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -204,10 +204,10 @@ class TabCountChangeObserver : public TabStripModelObserver { IPC::Message* reply_message, int target_tab_count); // Implementation of TabStripModelObserver. - virtual void TabInsertedAt(TabContents* contents, + virtual void TabInsertedAt(TabContentsWrapper* contents, int index, bool foreground); - virtual void TabDetachedAt(TabContents* contents, int index); + virtual void TabDetachedAt(TabContentsWrapper* contents, int index); virtual void TabStripModelDeleted(); private: diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index a0f7269b..9b03127 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -60,7 +60,7 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/interstitial_page.h" -#include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -485,7 +485,7 @@ void TestingAutomationProvider::AppendTab(int handle, const GURL& url, if (browser_tracker_->ContainsHandle(handle)) { Browser* browser = browser_tracker_->GetResource(handle); observer = AddTabStripObserver(browser, reply_message); - TabContents* contents = + TabContentsWrapper* contents = browser->AddSelectedTabWithURL(url, PageTransition::TYPED); if (contents) { append_tab_response = @@ -963,8 +963,7 @@ void TestingAutomationProvider::GetTab(int win_handle, if (browser_tracker_->ContainsHandle(win_handle) && (tab_index >= 0)) { Browser* browser = browser_tracker_->GetResource(win_handle); if (tab_index < browser->tab_count()) { - TabContents* tab_contents = - browser->GetTabContentsAt(tab_index); + TabContents* tab_contents = browser->GetTabContentsAt(tab_index); *tab_handle = tab_tracker_->Add(&tab_contents->controller()); } } |