diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-14 22:13:55 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-14 22:13:55 +0000 |
| commit | 9423d941cb200b789d482895ac644fe38d6bc048 (patch) | |
| tree | 3e82d246d3ce5a1bb4eeade7a1aebff27748814d /chrome/browser/sessions | |
| parent | 127788d038548a56be833f863c9936714f6452cb (diff) | |
| download | chromium_src-9423d941cb200b789d482895ac644fe38d6bc048.zip chromium_src-9423d941cb200b789d482895ac644fe38d6bc048.tar.gz chromium_src-9423d941cb200b789d482895ac644fe38d6bc048.tar.bz2 | |
Remove the TestTabContents. This makes BrowserWithTestWindow use the
TestRenderViewHost instead. There are some changes to browser_commands_unittest
to support this. Now that we're using proper TabContentes, I had to stub out
a FocusManager call since there isn't a proper view hierarchy created.
Remove TabContents collection and switching from the NavigationController. I
tried to keep the same interface to the NavigationController since I tried that
in a previous patch and the change blew up.
Remove the TabContents factory. Callers now create a WebContents directly.
Review URL: http://codereview.chromium.org/67113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_types.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc index 06c95d0..b6372ad 100644 --- a/chrome/browser/sessions/session_types.cc +++ b/chrome/browser/sessions/session_types.cc @@ -11,16 +11,12 @@ // static NavigationEntry* TabNavigation::ToNavigationEntry(int page_id) const { - GURL real_url = url_; - TabContentsType type = TabContents::TypeForURL(&real_url); - DCHECK(type != TAB_CONTENTS_UNKNOWN_TYPE); - NavigationEntry* entry = new NavigationEntry( - type, + TAB_CONTENTS_WEB, NULL, // The site instance for restored tabs is sent on navigation // (WebContents::GetSiteInstanceForEntry). page_id, - real_url, + url_, referrer_, title_, // Use a transition type of reload so that we don't incorrectly |