summaryrefslogtreecommitdiffstats
path: root/chrome/browser/session_startup_pref.cc
diff options
context:
space:
mode:
authordeanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-19 15:58:55 +0000
committerdeanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-19 15:58:55 +0000
commit23afa0fbdf77203d6ff57394ed0e2c1c3195b2bd (patch)
tree06e451dc4618209dff5ac0cc14d7cd4be0e58374 /chrome/browser/session_startup_pref.cc
parentc45b0b4811d594009e988ecf9eb5b6da55e7f5df (diff)
downloadchromium_src-23afa0fbdf77203d6ff57394ed0e2c1c3195b2bd.zip
chromium_src-23afa0fbdf77203d6ff57394ed0e2c1c3195b2bd.tar.gz
chromium_src-23afa0fbdf77203d6ff57394ed0e2c1c3195b2bd.tar.bz2
Build a bunch more of chrome/ on Linux.
Patch from Pawel Hajdan Jr. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/session_startup_pref.cc')
-rw-r--r--chrome/browser/session_startup_pref.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/session_startup_pref.cc b/chrome/browser/session_startup_pref.cc
index a261983..d99043d 100644
--- a/chrome/browser/session_startup_pref.cc
+++ b/chrome/browser/session_startup_pref.cc
@@ -37,6 +37,9 @@ void SessionStartupPref::SetStartupPref(PrefService* prefs,
case URLS:
type = 4;
break;
+
+ default:
+ break;
}
prefs->SetInteger(prefs::kRestoreOnStartup, type);
@@ -86,7 +89,7 @@ SessionStartupPref SessionStartupPref::GetStartupPref(PrefService* prefs) {
if (url_pref_list->Get(i, &value)) {
std::wstring url_text;
if (value->GetAsString(&url_text))
- pref.urls.push_back(GURL(url_text));
+ pref.urls.push_back(GURL(WideToUTF8(url_text)));
}
}