diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 19:48:55 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 19:48:55 +0000 |
| commit | 120f05fa80e35a372331dfe901e65c74383d3d30 (patch) | |
| tree | 6db2020ab2f6f41805524b3aa693d04c146f4057 /chrome/browser/browser.h | |
| parent | 45904e20797f8cd28a776ed0e40ba94dc4eef97e (diff) | |
| download | chromium_src-120f05fa80e35a372331dfe901e65c74383d3d30.zip chromium_src-120f05fa80e35a372331dfe901e65c74383d3d30.tar.gz chromium_src-120f05fa80e35a372331dfe901e65c74383d3d30.tar.bz2 | |
revert until I can figure out why the tests are hanging
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 42f76e4..63b28d5 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -123,6 +123,7 @@ class Browser : public TabStripModelDelegate, const std::vector<std::wstring>& user_data_dir_profiles() const { return g_browser_process->user_data_dir_profiles(); } +#ifdef UNIT_TEST // Sets the BrowserWindow. This is intended for testing and generally not // useful outside of testing. Use CreateBrowserWindow outside of testing, or // the static convenience methods that create a BrowserWindow for you. @@ -130,6 +131,7 @@ class Browser : public TabStripModelDelegate, DCHECK(!window_); window_ = window; } +#endif BrowserWindow* window() const { return window_; } ToolbarModel* toolbar_model() { return &toolbar_model_; } const SessionID& session_id() const { return session_id_; } |