summaryrefslogtreecommitdiffstats
path: root/chrome/browser/session_startup_pref.cc
diff options
context:
space:
mode:
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)));
}
}