summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_init.cc
diff options
context:
space:
mode:
authordsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 21:49:53 +0000
committerdsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 21:49:53 +0000
commit3a79b3cc8393d54d72c8c7e14615fe64d86fd039 (patch)
tree2730ef27672c8f9c9e1b6ef3f443434ac98bfd4f /chrome/browser/browser_init.cc
parent1c9e90e17741f9c34f4cbe7f3e68a8300ed24e08 (diff)
downloadchromium_src-3a79b3cc8393d54d72c8c7e14615fe64d86fd039.zip
chromium_src-3a79b3cc8393d54d72c8c7e14615fe64d86fd039.tar.gz
chromium_src-3a79b3cc8393d54d72c8c7e14615fe64d86fd039.tar.bz2
Port DictionaryValue to use string16 instead of wstring.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=10818 Review URL: http://codereview.chromium.org/31014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
-rw-r--r--chrome/browser/browser_init.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index d4ec343..a3d8dba 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -113,8 +113,10 @@ void SetOverrideHomePage(const CommandLine& command_line,
std::wstring new_homepage = URLFixerUpper::FixupRelativeFile(
browser_directory,
command_line.GetSwitchValue(switches::kHomePage));
- prefs->transient()->SetString(prefs::kHomePage, new_homepage);
- prefs->transient()->SetBoolean(prefs::kHomePageIsNewTabPage, false);
+ prefs->transient()->SetString(WideToUTF16Hack(prefs::kHomePage),
+ WideToUTF16Hack(new_homepage));
+ prefs->transient()->SetBoolean(
+ WideToUTF16Hack(prefs::kHomePageIsNewTabPage), false);
}
}
@@ -474,7 +476,8 @@ bool BrowserInit::ProcessCommandLine(
SetOverrideHomePage(command_line, profile->GetPrefs());
if (command_line.HasSwitch(switches::kBrowserStartRenderersManually))
- prefs->transient()->SetBoolean(prefs::kStartRenderersManually, true);
+ prefs->transient()->SetBoolean(
+ WideToUTF16Hack(prefs::kStartRenderersManually), true);
bool silent_launch = false;
#if defined(OS_WIN)