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

Unified Diff: remoting/host/capturer_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/branding.cc ('k') | remoting/host/elevated_controller_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/capturer_win.cc
diff --git a/remoting/host/capturer_win.cc b/remoting/host/capturer_win.cc
index 9e196e89712d331a485b05e4cd16e533dfdbbf7e..7ac278085183cc6067c87872f20266263de82ed6 100644
--- a/remoting/host/capturer_win.cc
+++ b/remoting/host/capturer_win.cc
@@ -10,8 +10,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/native_library.h"
-#include "base/string16.h"
-#include "base/stringize_macros.h"
+#include "base/utf_string_conversions.h"
#include "base/win/scoped_gdi_object.h"
#include "remoting/base/capture_data.h"
#include "remoting/host/capturer_helper.h"
@@ -30,7 +29,7 @@ const UINT DWM_EC_ENABLECOMPOSITION = 1;
typedef HRESULT (WINAPI * DwmEnableCompositionFunc)(UINT);
-const char16 kDwmapiLibraryName[] = TO_L_STRING("dwmapi");
+const wchar_t kDwmapiLibraryName[] = L"dwmapi";
// Pixel colors used when generating cursor outlines.
const uint32 kPixelBgraBlack = 0xff000000;
@@ -246,7 +245,8 @@ void CapturerGdi::Start(
if (dwmapi_library_ == NULL) {
std::string error;
dwmapi_library_ = base::LoadNativeLibrary(
- FilePath(base::GetNativeLibraryName(kDwmapiLibraryName)), &error);
+ FilePath(base::GetNativeLibraryName(WideToUTF16(kDwmapiLibraryName))),
+ &error);
}
if (dwmapi_library_ != NULL && composition_func_ == NULL) {
« no previous file with comments | « remoting/host/branding.cc ('k') | remoting/host/elevated_controller_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698