Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(674)

Unified Diff: chrome/browser/session_startup_pref.cc

Issue 3149: Porting changes in chrome/{browser,common}, also enabling more unit tests.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/renderer_security_policy.cc ('k') | chrome/common/SConscript » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/session_startup_pref.cc
===================================================================
--- chrome/browser/session_startup_pref.cc (revision 2402)
+++ chrome/browser/session_startup_pref.cc (working copy)
@@ -37,6 +37,9 @@
case URLS:
type = 4;
break;
+
+ default:
M-A Ruel 2008/09/19 12:51:18 add 'NOTREACHED();' here.
Dean McNamee 2008/09/19 12:58:10 That's a lie, it is reached. It's the case of DEF
M-A Ruel 2008/09/19 12:59:49 Ok, don't listen to me. On 2008/09/19 12:58:10, d
+ break;
}
prefs->SetInteger(prefs::kRestoreOnStartup, type);
@@ -86,7 +89,7 @@
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)));
}
}
« no previous file with comments | « chrome/browser/renderer_security_policy.cc ('k') | chrome/common/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698