diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 02:07:25 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 02:07:25 +0000 |
commit | b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78 (patch) | |
tree | d723b8556ad386a0b8a6e999e3a842e0bfe6f9b0 /webkit | |
parent | 1976d41ac728fcceb30f2df3c243cb7417f538f1 (diff) | |
download | chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.zip chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.gz chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.bz2 |
Use ASCII strings for switch names.
Review URL: http://codereview.chromium.org/270062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/plugins/plugin_constants_win.h | 2 | ||||
-rw-r--r-- | webkit/glue/plugins/plugin_list_linux.cc | 2 | ||||
-rw-r--r-- | webkit/glue/webworkerclient_impl.cc | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/node_leak_test.cc | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_switches.cc | 50 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_switches.h | 48 |
6 files changed, 53 insertions, 53 deletions
diff --git a/webkit/glue/plugins/plugin_constants_win.h b/webkit/glue/plugins/plugin_constants_win.h index f00886d..7357369 100644 --- a/webkit/glue/plugins/plugin_constants_win.h +++ b/webkit/glue/plugins/plugin_constants_win.h @@ -7,7 +7,7 @@ // Used by the plugins_test when testing the older WMP plugin to force the new // plugin to not get loaded. -#define kUseOldWMPPluginSwitch L"use-old-wmp" +#define kUseOldWMPPluginSwitch "use-old-wmp" // The window class name for a plugin window. #define kNativeWindowClassName L"NativeWindowClass" diff --git a/webkit/glue/plugins/plugin_list_linux.cc b/webkit/glue/plugins/plugin_list_linux.cc index 4f72ab1..d740bc6 100644 --- a/webkit/glue/plugins/plugin_list_linux.cc +++ b/webkit/glue/plugins/plugin_list_linux.cc @@ -13,7 +13,7 @@ namespace { // Return true if we're in debug-plugin-loading mode. bool DebugPluginLoading() { - static const wchar_t kDebugPluginLoading[] = L"debug-plugin-loading"; + static const char kDebugPluginLoading[] = "debug-plugin-loading"; return CommandLine::ForCurrentProcess()->HasSwitch(kDebugPluginLoading); } diff --git a/webkit/glue/webworkerclient_impl.cc b/webkit/glue/webworkerclient_impl.cc index 0946bc2..e84a411 100644 --- a/webkit/glue/webworkerclient_impl.cc +++ b/webkit/glue/webworkerclient_impl.cc @@ -67,7 +67,7 @@ WebCore::WorkerContextProxy* WebWorkerClientImpl::createWorkerContextProxy( WebCore::Worker* worker) { if (!worker->scriptExecutionContext()->isDocument() && CommandLine::ForCurrentProcess()->HasSwitch( - L"web-worker-share-processes")) { + "web-worker-share-processes")) { return new WebCore::WorkerMessagingProxy(worker); } diff --git a/webkit/tools/test_shell/node_leak_test.cc b/webkit/tools/test_shell/node_leak_test.cc index bfd5688..dc5a2b8 100644 --- a/webkit/tools/test_shell/node_leak_test.cc +++ b/webkit/tools/test_shell/node_leak_test.cc @@ -18,7 +18,7 @@ namespace { -const wchar_t kTestUrlSwitch[] = L"test-url"; +const char kTestUrlSwitch[] = "test-url"; // A test to help determine if any nodes have been leaked as a result of // visiting a given URL. If enabled in WebCore, the number of leaked nodes diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc index 26a79cb..1142ee1 100644 --- a/webkit/tools/test_shell/test_shell_switches.cc +++ b/webkit/tools/test_shell/test_shell_switches.cc @@ -7,79 +7,79 @@ namespace test_shell { // Suppresses all error dialogs when present. -const wchar_t kNoErrorDialogs[] = L"noerrdialogs"; +const char kNoErrorDialogs[] = "noerrdialogs"; // Causes the test_shell to run using stdin and stdout for URLs and output, // respectively, and interferes with interactive use of the UI. -const wchar_t kLayoutTests[] = L"layout-tests"; -const wchar_t kCrashDumps[] = L"crash-dumps"; // Enable crash dumps +const char kLayoutTests[] = "layout-tests"; +const char kCrashDumps[] = "crash-dumps"; // Enable crash dumps // Causes the test_shell to run with a generic theme (part of layout_tests). -const wchar_t kGenericTheme[] = L"generic-theme"; +const char kGenericTheme[] = "generic-theme"; // This causes the test_shell to run with the classic theme. // Passing --layout-tests enables this by default. -const wchar_t kClassicTheme[] = L"classic-theme"; +const char kClassicTheme[] = "classic-theme"; // This causes the test_shell to run with the new windows theming engine // enabled. This is the default unless --layout-tests is specified. -const wchar_t kUxTheme[] = L"ux-theme"; +const char kUxTheme[] = "ux-theme"; // Command line flags that control the tests when layout-tests is specified. -const wchar_t kNoTree[] = L"notree"; // Don't dump the render tree. -const wchar_t kDumpPixels[] = L"pixel-tests"; // Enable pixel tests. +const char kNoTree[] = "notree"; // Don't dump the render tree. +const char kDumpPixels[] = "pixel-tests"; // Enable pixel tests. // Optional command line switch that specifies timeout time for page load when // running file tests in layout test mode, in ms. -const wchar_t kTestShellTimeOut[] = L"time-out-ms"; +const char kTestShellTimeOut[] = "time-out-ms"; -const wchar_t kStartupDialog[] = L"testshell-startup-dialog"; +const char kStartupDialog[] = "testshell-startup-dialog"; // Enable the Windows dialogs for GP faults in the test shell. This allows makes // it possible to attach a crashed test shell to a debugger. -const wchar_t kGPFaultErrorBox[] = L"gp-fault-error-box"; +const char kGPFaultErrorBox[] = "gp-fault-error-box"; // JavaScript flags passed to engine. -const wchar_t kJavaScriptFlags[] = L"js-flags"; +const char kJavaScriptFlags[] = "js-flags"; // Run the http cache in record mode. -const wchar_t kRecordMode[] = L"record-mode"; +const char kRecordMode[] = "record-mode"; // Run the http cache in playback mode. -const wchar_t kPlaybackMode[] = L"playback-mode"; +const char kPlaybackMode[] = "playback-mode"; // Don't record/playback events when using record & playback. -const wchar_t kNoEvents[] = L"no-events"; +const char kNoEvents[] = "no-events"; // Dump stats table on exit. -const wchar_t kDumpStatsTable[] = L"stats"; +const char kDumpStatsTable[] = "stats"; // Use a specified cache directory. -const wchar_t kCacheDir[] = L"cache-dir"; +const char kCacheDir[] = "cache-dir"; // When being run through a memory profiler, trigger memory in use dumps at // startup and just prior to shutdown. -const wchar_t kDebugMemoryInUse[] = L"debug-memory-in-use"; +const char kDebugMemoryInUse[] = "debug-memory-in-use"; // Enable cookies on the file:// scheme. --layout-tests also enables this. -const wchar_t kEnableFileCookies[] = L"enable-file-cookies"; +const char kEnableFileCookies[] = "enable-file-cookies"; // Enable tracing events (see base/trace_event.h) -const wchar_t kEnableTracing[] = L"enable-tracing"; +const char kEnableTracing[] = "enable-tracing"; // Allow scripts to close windows in all cases. -const wchar_t kAllowScriptsToCloseWindows[] = L"allow-scripts-to-close-windows"; +const char kAllowScriptsToCloseWindows[] = "allow-scripts-to-close-windows"; // Test the system dependencies (themes, fonts, ...). When this flag is // specified, the test shell will exit immediately with either 0 (success) or // 1 (failure). Combining with other flags has no effect. -extern const wchar_t kCheckLayoutTestSystemDeps[] = - L"check-layout-test-sys-deps"; +extern const char kCheckLayoutTestSystemDeps[] = + "check-layout-test-sys-deps"; // If set, we are running under GDB so allow a certain class of errors // to happen even if in layout test mode. -extern const wchar_t kGDB[] = L"gdb"; +extern const char kGDB[] = "gdb"; // Make functions of the Profiler class available in javascript -extern const wchar_t kProfiler[] = L"profiler"; +extern const char kProfiler[] = "profiler"; } // namespace test_shell diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h index d07398b..d580695 100644 --- a/webkit/tools/test_shell/test_shell_switches.h +++ b/webkit/tools/test_shell/test_shell_switches.h @@ -9,30 +9,30 @@ namespace test_shell { -extern const wchar_t kCrashDumps[]; -extern const wchar_t kDumpPixels[]; -extern const wchar_t kLayoutTests[]; -extern const wchar_t kGenericTheme[]; -extern const wchar_t kClassicTheme[]; -extern const wchar_t kUxTheme[]; -extern const wchar_t kNoErrorDialogs[]; -extern const wchar_t kNoTree[]; -extern const wchar_t kTestShellTimeOut[]; -extern const wchar_t kStartupDialog[]; -extern const wchar_t kGPFaultErrorBox[]; -extern const wchar_t kJavaScriptFlags[]; -extern const wchar_t kRecordMode[]; -extern const wchar_t kPlaybackMode[]; -extern const wchar_t kNoEvents[]; -extern const wchar_t kDumpStatsTable[]; -extern const wchar_t kCacheDir[]; -extern const wchar_t kDebugMemoryInUse[]; -extern const wchar_t kEnableFileCookies[]; -extern const wchar_t kEnableTracing[]; -extern const wchar_t kAllowScriptsToCloseWindows[]; -extern const wchar_t kCheckLayoutTestSystemDeps[]; -extern const wchar_t kGDB[]; -extern const wchar_t kProfiler[]; +extern const char kCrashDumps[]; +extern const char kDumpPixels[]; +extern const char kLayoutTests[]; +extern const char kGenericTheme[]; +extern const char kClassicTheme[]; +extern const char kUxTheme[]; +extern const char kNoErrorDialogs[]; +extern const char kNoTree[]; +extern const char kTestShellTimeOut[]; +extern const char kStartupDialog[]; +extern const char kGPFaultErrorBox[]; +extern const char kJavaScriptFlags[]; +extern const char kRecordMode[]; +extern const char kPlaybackMode[]; +extern const char kNoEvents[]; +extern const char kDumpStatsTable[]; +extern const char kCacheDir[]; +extern const char kDebugMemoryInUse[]; +extern const char kEnableFileCookies[]; +extern const char kEnableTracing[]; +extern const char kAllowScriptsToCloseWindows[]; +extern const char kCheckLayoutTestSystemDeps[]; +extern const char kGDB[]; +extern const char kProfiler[]; } // namespace test_shell |