diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 22:37:12 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 22:37:12 +0000 |
| commit | 7ec296b6669d76014ba369285bcfa6abda607faf (patch) | |
| tree | bb2310f2f72ea6b397408ec9a79a11091105506f /chrome/browser/sessions/session_service.cc | |
| parent | 0b9d3d2ff9872e2971eb0479bd16efe74ee3d44f (diff) | |
| download | chromium_src-7ec296b6669d76014ba369285bcfa6abda607faf.zip chromium_src-7ec296b6669d76014ba369285bcfa6abda607faf.tar.gz chromium_src-7ec296b6669d76014ba369285bcfa6abda607faf.tar.bz2 | |
Fix a bug in session restore on linux/mac. We were pickling the
page title as a wstring, but reading it back as a string16. This
allows the SessionRestoreUITests to pass.
Also enable the inspector ui test which is currently disabled, but the code compiles fine on linux/mac.
BUG=10516
Review URL: http://codereview.chromium.org/99297
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/session_service.cc')
| -rw-r--r-- | chrome/browser/sessions/session_service.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index c0b8158..9e13654 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -28,12 +28,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/scoped_vector.h" -// TODO(port): Get rid of this section and finish porting. -#if defined(OS_WIN) -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/win_util.h" -#endif - using base::Time; // Identifier for commands written to file. |