diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 16:17:49 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 16:17:49 +0000 |
| commit | 3c9e187bd8ec34ebf2a91a37c868584c465647e8 (patch) | |
| tree | 84c9540d220fa155cf2af8c944638c0719dee670 /chrome/test | |
| parent | 3e35b224fd0c36f17f432f23e2eb3729667210b1 (diff) | |
| download | chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.zip chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.tar.gz chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.tar.bz2 | |
Make pink's TabContentsWrapper change compile on Windows.
Code by pinkerton@, with modifications by evanm and myself to get it to build on windows/linux/chromeos.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4694008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/browser_with_test_window_test.cc | 1 | ||||
| -rw-r--r-- | chrome/test/live_sync/live_sessions_sync_test.h | 3 | ||||
| -rw-r--r-- | chrome/test/test_browser_window.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc index fa61362..0871256 100644 --- a/chrome/test/browser_with_test_window_test.cc +++ b/chrome/test/browser_with_test_window_test.cc @@ -11,6 +11,7 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.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/ui/browser_navigator.h" diff --git a/chrome/test/live_sync/live_sessions_sync_test.h b/chrome/test/live_sync/live_sessions_sync_test.h index 48c9d63..b4a03c5 100644 --- a/chrome/test/live_sync/live_sessions_sync_test.h +++ b/chrome/test/live_sync/live_sessions_sync_test.h @@ -20,6 +20,7 @@ #include "chrome/browser/sessions/base_session_service.h" #include "chrome/browser/sessions/session_service_test_helper.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/test/live_sync/live_sync_test.h" #include "chrome/test/ui_test_utils.h" #include "googleurl/src/gurl.h" @@ -194,7 +195,7 @@ class LiveSessionsSyncTest : public LiveSyncTest { // to ensure the tab opened successsfully. TabContents* OpenTab(int index, GURL url) WARN_UNUSED_RESULT { TabContents* tab = GetBrowser(index)-> - AddSelectedTabWithURL(url, PageTransition::START_PAGE); + AddSelectedTabWithURL(url, PageTransition::START_PAGE)->tab_contents(); // Wait for the page to finish loading. ui_test_utils::WaitForNavigation( diff --git a/chrome/test/test_browser_window.h b/chrome/test/test_browser_window.h index 1ae5f26..71a15e4 100644 --- a/chrome/test/test_browser_window.h +++ b/chrome/test/test_browser_window.h @@ -45,7 +45,7 @@ class TestBrowserWindow : public BrowserWindow { } virtual void SetFocusToLocationBar(bool select_all) {} virtual void UpdateReloadStopState(bool is_loading, bool force) {} - virtual void UpdateToolbar(TabContents* contents, + virtual void UpdateToolbar(TabContentsWrapper* contents, bool should_restore_state) {} virtual void FocusToolbar() {} virtual void FocusAppMenu() {} |