diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 07:58:34 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 07:58:34 +0000 |
| commit | 57c6a6579cf274fe37d6196931a3034d90da7113 (patch) | |
| tree | ec42313580156ccc039b5fee714ee12259cb08ee /chrome/browser/sessions | |
| parent | b23c9e1f05d474adc327c85d87eacc77554976e0 (diff) | |
| download | chromium_src-57c6a6579cf274fe37d6196931a3034d90da7113.zip chromium_src-57c6a6579cf274fe37d6196931a3034d90da7113.tar.gz chromium_src-57c6a6579cf274fe37d6196931a3034d90da7113.tar.bz2 | |
Replace all occurrances of WebContents with TabContents.
Review URL: http://codereview.chromium.org/99177
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/sessions/session_types.cc | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index b37ecc9..e1319e9 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -14,7 +14,7 @@ #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/web_contents.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" @@ -365,10 +365,7 @@ class SessionRestoreImpl : public NotificationObserver { browser->window()->Show(); // TODO(jcampan): http://crbug.com/8123 we should not need to set the // initial focus explicitly. - if (browser->GetSelectedTabContents()->AsWebContents()) { - browser->GetSelectedTabContents()->AsWebContents()->view()-> - SetInitialFocus(); - } + browser->GetSelectedTabContents()->view()->SetInitialFocus(); } void AppendURLsToBrowser(Browser* browser, const std::vector<GURL>& urls) { diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc index 3483228..14caf79 100644 --- a/chrome/browser/sessions/session_types.cc +++ b/chrome/browser/sessions/session_types.cc @@ -13,7 +13,7 @@ NavigationEntry* TabNavigation::ToNavigationEntry(int page_id) const { NavigationEntry* entry = new NavigationEntry( NULL, // The site instance for restored tabs is sent on navigation - // (WebContents::GetSiteInstanceForEntry). + // (TabContents::GetSiteInstanceForEntry). page_id, url_, referrer_, |