| Index: sandbox/win/src/window.cc
|
| diff --git a/sandbox/win/src/window.cc b/sandbox/win/src/window.cc
|
| index d8de967272661360a9309ee6bf571c4bfed4b47d..d21858a42a4a2cb24ecc0becbca41e22a992cf79 100644
|
| --- a/sandbox/win/src/window.cc
|
| +++ b/sandbox/win/src/window.cc
|
| @@ -53,7 +53,7 @@ ResultCode CreateAltWindowStation(HWINSTA* winsta) {
|
| }
|
|
|
| ResultCode CreateAltDesktop(HWINSTA winsta, HDESK* desktop) {
|
| - std::wstring desktop_name = L"sbox_alternate_desktop_";
|
| + base::string16 desktop_name = L"sbox_alternate_desktop_";
|
|
|
| // Append the current PID to the desktop name.
|
| wchar_t buffer[16];
|
| @@ -100,14 +100,14 @@ ResultCode CreateAltDesktop(HWINSTA winsta, HDESK* desktop) {
|
| return SBOX_ERROR_CANNOT_CREATE_DESKTOP;
|
| }
|
|
|
| -std::wstring GetWindowObjectName(HANDLE handle) {
|
| +base::string16 GetWindowObjectName(HANDLE handle) {
|
| // Get the size of the name.
|
| DWORD size = 0;
|
| ::GetUserObjectInformation(handle, UOI_NAME, NULL, 0, &size);
|
|
|
| if (!size) {
|
| NOTREACHED();
|
| - return std::wstring();
|
| + return base::string16();
|
| }
|
|
|
| // Create the buffer that will hold the name.
|
| @@ -117,19 +117,19 @@ std::wstring GetWindowObjectName(HANDLE handle) {
|
| if (!::GetUserObjectInformation(handle, UOI_NAME, name_buffer.get(), size,
|
| &size)) {
|
| NOTREACHED();
|
| - return std::wstring();
|
| + return base::string16();
|
| }
|
|
|
| - return std::wstring(name_buffer.get());
|
| + return base::string16(name_buffer.get());
|
| }
|
|
|
| -std::wstring GetFullDesktopName(HWINSTA winsta, HDESK desktop) {
|
| +base::string16 GetFullDesktopName(HWINSTA winsta, HDESK desktop) {
|
| if (!desktop) {
|
| NOTREACHED();
|
| - return std::wstring();
|
| + return base::string16();
|
| }
|
|
|
| - std::wstring name;
|
| + base::string16 name;
|
| if (winsta) {
|
| name = GetWindowObjectName(winsta);
|
| name += L'\\';
|
|
|