diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 22:45:34 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 22:45:34 +0000 |
| commit | b689fce776a394377fed51ae063942509a2988a1 (patch) | |
| tree | eb52e9944db424e9e1b80bcefe9b9b96b1c27b50 /chrome/browser/tabs | |
| parent | 84ae20cba3059760948ca5d1f313dc25c74b26d6 (diff) | |
| download | chromium_src-b689fce776a394377fed51ae063942509a2988a1.zip chromium_src-b689fce776a394377fed51ae063942509a2988a1.tar.gz chromium_src-b689fce776a394377fed51ae063942509a2988a1.tar.bz2 | |
Merge DOMUIContents into WebContents.
I did a lot of cleanup of the DOM UI system as part of this.
Review URL: http://codereview.chromium.org/42227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 2b29a16..8845024 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -31,7 +31,9 @@ class TabStripDummyDelegate : public TabStripModelDelegate { virtual ~TabStripDummyDelegate() {} // Overridden from TabStripModelDelegate: - virtual GURL GetBlankTabURL() const { return NewTabUI::GetBaseURL(); } + virtual GURL GetBlankTabURL() const { + return GURL(chrome::kChromeUINewTabURL); + } virtual void CreateNewStripWithContents(TabContents* contents, const gfx::Rect& window_bounds, const DockInfo& dock_info) {} @@ -43,7 +45,7 @@ class TabStripDummyDelegate : public TabStripModelDelegate { PageTransition::Type transition, bool defer_load, SiteInstance* instance) const { - if (url == NewTabUI::GetBaseURL()) + if (url == GURL(chrome::kChromeUINewTabURL)) return dummy_contents_; return NULL; } |