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

Unified Diff: content/common/plugin_list_win.cc

Issue 113403006: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « content/common/plugin_constants_win.cc ('k') | content/common/sandbox_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/plugin_list_win.cc
diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc
index 7d9706ba39fa05eb6f03d6d3063572bcdba9d6fb..3afe1abed6600122b30942489c0e4fc99ff633e4 100644
--- a/content/common/plugin_list_win.cc
+++ b/content/common/plugin_list_win.cc
@@ -25,23 +25,23 @@
namespace content {
namespace {
-const char16 kRegistryApps[] =
+const base::char16 kRegistryApps[] =
L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths";
-const char16 kRegistryFirefox[] = L"firefox.exe";
-const char16 kRegistryAcrobat[] = L"Acrobat.exe";
-const char16 kRegistryAcrobatReader[] = L"AcroRd32.exe";
-const char16 kRegistryWindowsMedia[] = L"wmplayer.exe";
-const char16 kRegistryQuickTime[] = L"QuickTimePlayer.exe";
-const char16 kRegistryPath[] = L"Path";
-const char16 kRegistryFirefoxInstalled[] =
+const base::char16 kRegistryFirefox[] = L"firefox.exe";
+const base::char16 kRegistryAcrobat[] = L"Acrobat.exe";
+const base::char16 kRegistryAcrobatReader[] = L"AcroRd32.exe";
+const base::char16 kRegistryWindowsMedia[] = L"wmplayer.exe";
+const base::char16 kRegistryQuickTime[] = L"QuickTimePlayer.exe";
+const base::char16 kRegistryPath[] = L"Path";
+const base::char16 kRegistryFirefoxInstalled[] =
L"SOFTWARE\\Mozilla\\Mozilla Firefox";
-const char16 kRegistryJava[] =
+const base::char16 kRegistryJava[] =
L"Software\\JavaSoft\\Java Runtime Environment";
-const char16 kRegistryBrowserJavaVersion[] = L"BrowserJavaVersion";
-const char16 kRegistryCurrentJavaVersion[] = L"CurrentVersion";
-const char16 kRegistryJavaHome[] = L"JavaHome";
-const char16 kJavaDeploy1[] = L"npdeploytk.dll";
-const char16 kJavaDeploy2[] = L"npdeployjava1.dll";
+const base::char16 kRegistryBrowserJavaVersion[] = L"BrowserJavaVersion";
+const base::char16 kRegistryCurrentJavaVersion[] = L"CurrentVersion";
+const base::char16 kRegistryJavaHome[] = L"JavaHome";
+const base::char16 kJavaDeploy1[] = L"npdeploytk.dll";
+const base::char16 kJavaDeploy2[] = L"npdeployjava1.dll";
base::FilePath AppendPluginsDir(const base::FilePath& path) {
return path.AppendASCII("plugins");
@@ -68,7 +68,7 @@ void GetExeDirectory(std::set<base::FilePath>* plugin_dirs) {
}
// Gets the installed path for a registered app.
-bool GetInstalledPath(const char16* app, base::FilePath* out) {
+bool GetInstalledPath(const base::char16* app, base::FilePath* out) {
base::string16 reg_path(kRegistryApps);
reg_path.append(L"\\");
reg_path.append(app);
« no previous file with comments | « content/common/plugin_constants_win.cc ('k') | content/common/sandbox_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698