summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 22:45:00 +0000
committerkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 22:45:00 +0000
commit9017a7808e576c7faac46695ab7845ec30434197 (patch)
treecb4653fccc9fc1b603769946e1d98a6f77df8785
parent6788b080965ee06e7bc329526834cd1490a5b772 (diff)
downloadchromium_src-9017a7808e576c7faac46695ab7845ec30434197.zip
chromium_src-9017a7808e576c7faac46695ab7845ec30434197.tar.gz
chromium_src-9017a7808e576c7faac46695ab7845ec30434197.tar.bz2
Add argument to match overridden method. Fixes clang.
BUG=none TEST=none TBR=phajdan.jr git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80859 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/automation/automation_tab_helper.cc11
-rw-r--r--chrome/browser/automation/automation_tab_helper.h4
-rw-r--r--chrome/browser/automation/automation_tab_helper_unittest.cc2
3 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/automation/automation_tab_helper.cc b/chrome/browser/automation/automation_tab_helper.cc
index 0151ee4..8e56ab2 100644
--- a/chrome/browser/automation/automation_tab_helper.cc
+++ b/chrome/browser/automation/automation_tab_helper.cc
@@ -82,19 +82,20 @@ void AutomationTabHelper::DidStopLoading() {
}
void AutomationTabHelper::RenderViewGone() {
- OnTabOrRenderViewDestroyed();
+ OnTabOrRenderViewDestroyed(tab_contents());
}
-void AutomationTabHelper::OnTabContentsDestroyed() {
- OnTabOrRenderViewDestroyed();
+void AutomationTabHelper::OnTabContentsDestroyed(TabContents* tab_contents) {
+ OnTabOrRenderViewDestroyed(tab_contents);
}
-void AutomationTabHelper::OnTabOrRenderViewDestroyed() {
+void AutomationTabHelper::OnTabOrRenderViewDestroyed(
+ TabContents* tab_contents) {
if (has_pending_loads()) {
is_loading_ = false;
pending_client_redirects_.clear();
FOR_EACH_OBSERVER(TabEventObserver, observers_,
- OnNoMorePendingLoads(tab_contents()));
+ OnNoMorePendingLoads(tab_contents));
}
}
diff --git a/chrome/browser/automation/automation_tab_helper.h b/chrome/browser/automation/automation_tab_helper.h
index 0b9bccb..96f7a5a 100644
--- a/chrome/browser/automation/automation_tab_helper.h
+++ b/chrome/browser/automation/automation_tab_helper.h
@@ -95,12 +95,12 @@ class AutomationTabHelper
virtual void DidStartLoading();
virtual void DidStopLoading();
virtual void RenderViewGone();
- virtual void OnTabContentsDestroyed();
+ virtual void OnTabContentsDestroyed(TabContents* tab_contents);
virtual bool OnMessageReceived(const IPC::Message& message);
void OnWillPerformClientRedirect(int64 frame_id, double delay_seconds);
void OnDidCompleteOrCancelClientRedirect(int64 frame_id);
- void OnTabOrRenderViewDestroyed();
+ void OnTabOrRenderViewDestroyed(TabContents* tab_contents);
// True if the tab is currently loading. If a navigation is scheduled but not
// yet loading, this will be false.
diff --git a/chrome/browser/automation/automation_tab_helper_unittest.cc b/chrome/browser/automation/automation_tab_helper_unittest.cc
index 8e3453f..3191f90 100644
--- a/chrome/browser/automation/automation_tab_helper_unittest.cc
+++ b/chrome/browser/automation/automation_tab_helper_unittest.cc
@@ -35,7 +35,7 @@ class AutomationTabHelperTest : public TabContentsWrapperTestHarness {
}
void TabContentsDestroyed() {
- tab_helper()->OnTabContentsDestroyed();
+ tab_helper()->OnTabContentsDestroyed(contents_wrapper()->tab_contents());
}
void WillPerformClientRedirect(int64 frame_id) {