diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 15:23:08 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 15:23:08 +0000 |
| commit | 4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c (patch) | |
| tree | e2f495edbb471c545155e2421495500da7ef52d4 /chrome/test/base | |
| parent | 075ee36cf9db4bf2c83cb1d95baf3ffb9faeda99 (diff) | |
| download | chromium_src-4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c.zip chromium_src-4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c.tar.gz chromium_src-4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c.tar.bz2 | |
Clean up TCW, make it solely a hub for 1:1 observer/helper objects.
BUG=105872
TEST=no functional change
Review URL: http://codereview.chromium.org/8892011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base')
| -rw-r--r-- | chrome/test/base/browser_with_test_window_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/base/test_tab_strip_model_observer.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc index d0e792d..d071474 100644 --- a/chrome/test/base/browser_with_test_window_test.cc +++ b/chrome/test/base/browser_with_test_window_test.cc @@ -64,7 +64,7 @@ void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) { params.tabstrip_index = 0; params.disposition = NEW_FOREGROUND_TAB; browser::Navigate(¶ms); - CommitPendingLoad(¶ms.target_contents->controller()); + CommitPendingLoad(¶ms.target_contents->tab_contents()->controller()); } void BrowserWithTestWindowTest::CommitPendingLoad( diff --git a/chrome/test/base/test_tab_strip_model_observer.cc b/chrome/test/base/test_tab_strip_model_observer.cc index 7beda3c..dcb8196 100644 --- a/chrome/test/base/test_tab_strip_model_observer.cc +++ b/chrome/test/base/test_tab_strip_model_observer.cc @@ -9,6 +9,7 @@ #include "chrome/browser/printing/print_preview_tab_controller.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_source.h" TestTabStripModelObserver::TestTabStripModelObserver( @@ -41,8 +42,8 @@ void TestTabStripModelObserver::ObservePrintPreviewTabContents( TabContentsWrapper* preview_tab = tab_controller->GetPrintPreviewForTab(contents); if (preview_tab) { - RegisterAsObserver( - content::Source<NavigationController>(&preview_tab->controller())); + RegisterAsObserver(content::Source<NavigationController>( + &preview_tab->tab_contents()->controller())); } } } |