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

Unified Diff: remoting/host/elevated_controller_win.cc

Issue 10579034: Removing incorrect usage of TO_L_STRING() macros. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 6 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 | « remoting/host/capturer_win.cc ('k') | remoting/host/host_service_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/elevated_controller_win.cc
diff --git a/remoting/host/elevated_controller_win.cc b/remoting/host/elevated_controller_win.cc
index 7ca42dd08c95cc92018c107153a0819d6809df8c..faeb2da88f10f124e55094d6b735df78141335b5 100644
--- a/remoting/host/elevated_controller_win.cc
+++ b/remoting/host/elevated_controller_win.cc
@@ -14,7 +14,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
#include "base/process_util.h"
-#include "base/stringize_macros.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "base/win/scoped_handle.h"
@@ -42,11 +41,11 @@ const FilePath::CharType kTempFileExtension[] = FILE_PATH_LITERAL("json~");
// The host configuration file security descriptor that enables full access to
// Local System and built-in administrators only.
-const char16 kConfigFileSecurityDescriptor[] =
- TO_L_STRING("O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)");
+const wchar_t kConfigFileSecurityDescriptor[] =
+ L"O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)";
-const char16 kUnprivilegedConfigFileSecurityDescriptor[] =
- TO_L_STRING("O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)(A;;GR;;;AU)");
+const wchar_t kUnprivilegedConfigFileSecurityDescriptor[] =
+ L"O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)(A;;GR;;;AU)";
// Configuration keys.
const char kHostId[] = "host_id";
@@ -142,7 +141,7 @@ FilePath GetTempLocationFor(const FilePath& filename) {
// Writes a config file to a temporary location.
HRESULT WriteConfigFileToTemp(const FilePath& filename,
- const char16* security_descriptor,
+ const wchar_t* security_descriptor,
const char* content,
size_t length) {
// Create a security descriptor for the configuration file.
« no previous file with comments | « remoting/host/capturer_win.cc ('k') | remoting/host/host_service_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698