diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 01:16:30 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 01:16:30 +0000 |
| commit | bd580a2503917df061b20b1948297650344b931f (patch) | |
| tree | 3cbd377b6793e00c8d6f936afdfb10acf6397552 /chrome/browser/sessions | |
| parent | ee550e1f837209fdfdfdfdcf5384d6fb7c49608b (diff) | |
| download | chromium_src-bd580a2503917df061b20b1948297650344b931f.zip chromium_src-bd580a2503917df061b20b1948297650344b931f.tar.gz chromium_src-bd580a2503917df061b20b1948297650344b931f.tar.bz2 | |
Make tab_restore_service.cc compile on Mac and Linux.
Review URL: http://codereview.chromium.org/23022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/tab_restore_service.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/sessions/tab_restore_service.h | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc index 54adce1..9a7a5bf 100644 --- a/chrome/browser/sessions/tab_restore_service.cc +++ b/chrome/browser/sessions/tab_restore_service.cc @@ -9,8 +9,8 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/profile.h" -#include "chrome/browser/sessions/session_backend.h" #include "chrome/browser/sessions/session_service.h" +#include "chrome/browser/sessions/session_command.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/scoped_vector.h" @@ -232,7 +232,8 @@ void TabRestoreService::RestoreEntryById(Browser* browser, NavigationController* restored_controller = browser->AddRestoredTab(tab.navigations, browser->tab_count(), tab.current_navigation_index, - (tab_i == window->selected_tab_index)); + (static_cast<int>(tab_i) == + window->selected_tab_index)); if (restored_controller) restored_controller->LoadIfNecessary(); } diff --git a/chrome/browser/sessions/tab_restore_service.h b/chrome/browser/sessions/tab_restore_service.h index 2962cf5..2391224 100644 --- a/chrome/browser/sessions/tab_restore_service.h +++ b/chrome/browser/sessions/tab_restore_service.h @@ -10,10 +10,20 @@ #include "base/observer_list.h" #include "base/time.h" -#include "chrome/browser/sessions/base_session_service.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/sessions/session_types.h" +#if defined(OS_POSIX) +// TODO(port): get rid of this include. It's used just to provide declarations +// and stub definitions for classes we encouter during the porting effort. +#include "chrome/common/temp_scaffolding_stubs.h" +#endif + +// TODO(port): Get rid of this section and finish porting. +#if defined(OS_WIN) +#include "chrome/browser/sessions/base_session_service.h" +#endif + class Browser; class NavigationController; class Profile; |