summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorstoyan@google.com <stoyan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 18:01:41 +0000
committerstoyan@google.com <stoyan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 18:01:41 +0000
commit60e68394b9916739f014faf2e1113d80fff53291 (patch)
tree6085c709a8104aa69970b565f63e34e7c751390d /chrome_frame
parentdbeb39586fd6d8e75ed6ad4e6c4606ee16e53348 (diff)
downloadchromium_src-60e68394b9916739f014faf2e1113d80fff53291.zip
chromium_src-60e68394b9916739f014faf2e1113d80fff53291.tar.gz
chromium_src-60e68394b9916739f014faf2e1113d80fff53291.tar.bz2
Fix ChromeFrame build caused by http://src.chromium.org/viewvc/chrome?view=rev&revision=28779
TBR=amit Review URL: http://codereview.chromium.org/274021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_launcher.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_launcher.cc b/chrome_frame/chrome_launcher.cc
index f5e2903..f742a28 100644
--- a/chrome_frame/chrome_launcher.cc
+++ b/chrome_frame/chrome_launcher.cc
@@ -20,7 +20,7 @@ const wchar_t kLauncherExeBaseName[] = L"chrome_launcher.exe";
// These are the switches we will allow (along with their values) in the
// safe-for-Low-Integrity version of the Chrome command line.
-const wchar_t* kAllowedSwitches[] = {
+const char* kAllowedSwitches[] = {
switches::kAutomationClientChannelID,
switches::kDisableMetrics,
switches::kNoFirstRun,
@@ -61,7 +61,7 @@ CommandLine* CreateLaunchCommandLine() {
void SanitizeCommandLine(const CommandLine& original, CommandLine* sanitized) {
int num_sanitized_switches = 0;
for (int i = 0; i < arraysize(kAllowedSwitches); ++i) {
- const wchar_t* current_switch = kAllowedSwitches[i];
+ const char* current_switch = kAllowedSwitches[i];
if (original.HasSwitch(current_switch)) {
++num_sanitized_switches;
std::wstring switch_value = original.GetSwitchValue(current_switch);