summaryrefslogtreecommitdiffstats
path: root/chrome/test/test_browser_window.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 06:48:32 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 06:48:32 +0000
commit109763bb929004fefa409c342d1c14a78bfe126f (patch)
tree0614c618674684955caa470ee49d26e05e7dc3e1 /chrome/test/test_browser_window.h
parent457764525fd9a27612d7c8bc9d77ae0646db1a56 (diff)
downloadchromium_src-109763bb929004fefa409c342d1c14a78bfe126f.zip
chromium_src-109763bb929004fefa409c342d1c14a78bfe126f.tar.gz
chromium_src-109763bb929004fefa409c342d1c14a78bfe126f.tar.bz2
Made sync code build and pass unit tests on OS X.
Major changes: - Moved sync_setup_{flow,wizard} to sync directory. - Made browser_with_test_window_test compile on non-Windows platform. - Moved localized contents font util functions to app/. BUG=23073 TEST=trybot Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29253 Review URL: http://codereview.chromium.org/279004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/test_browser_window.h')
-rw-r--r--chrome/test/test_browser_window.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/test/test_browser_window.h b/chrome/test/test_browser_window.h
index 8aa657d..d785415 100644
--- a/chrome/test/test_browser_window.h
+++ b/chrome/test/test_browser_window.h
@@ -7,18 +7,14 @@
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_window.h"
-#include "chrome/browser/views/tabs/tab_strip.h"
#include "chrome/test/test_location_bar.h"
// An implementation of BrowserWindow used for testing. TestBrowserWindow only
-// contains a valid TabStrip, all other getters return NULL.
+// contains a valid LocationBar, all other getters return NULL.
// See BrowserWithTestWindowTest for an example of using this class.
class TestBrowserWindow : public BrowserWindow {
public:
- explicit TestBrowserWindow(Browser* browser)
- : tab_strip_(browser->tabstrip_model()) {
- tab_strip_.InitTabStripButtons();
- }
+ explicit TestBrowserWindow(Browser* browser) {}
virtual ~TestBrowserWindow() {}
virtual void Init() {}
@@ -91,8 +87,6 @@ class TestBrowserWindow : public BrowserWindow {
virtual void DestroyBrowser() {}
private:
- TabStrip tab_strip_;
-
TestLocationBar location_bar_;
DISALLOW_COPY_AND_ASSIGN(TestBrowserWindow);