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

Side by Side Diff: remoting/host/win/security_descriptor.cc

Issue 111373008: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/win/launch_process_with_token.cc ('k') | sandbox/win/src/handle_closer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/win/security_descriptor.h" 5 #include "remoting/host/win/security_descriptor.h"
6 6
7 #include <sddl.h> 7 #include <sddl.h>
8 8
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 10 matching lines...) Expand all
21 21
22 ScopedSd sd(length); 22 ScopedSd sd(length);
23 memcpy(sd.get(), raw_sd, length); 23 memcpy(sd.get(), raw_sd, length);
24 24
25 LocalFree(raw_sd); 25 LocalFree(raw_sd);
26 return sd.Pass(); 26 return sd.Pass();
27 } 27 }
28 28
29 // Converts a SID into a text string. 29 // Converts a SID into a text string.
30 std::string ConvertSidToString(SID* sid) { 30 std::string ConvertSidToString(SID* sid) {
31 char16* c_sid_string = NULL; 31 base::char16* c_sid_string = NULL;
32 if (!ConvertSidToStringSid(sid, &c_sid_string)) 32 if (!ConvertSidToStringSid(sid, &c_sid_string))
33 return std::string(); 33 return std::string();
34 34
35 base::string16 sid_string(c_sid_string); 35 base::string16 sid_string(c_sid_string);
36 LocalFree(c_sid_string); 36 LocalFree(c_sid_string);
37 return UTF16ToUTF8(sid_string); 37 return UTF16ToUTF8(sid_string);
38 } 38 }
39 39
40 // Returns the logon SID of a token. Returns NULL if the token does not specify 40 // Returns the logon SID of a token. Returns NULL if the token does not specify
41 // a logon SID or in case of an error. 41 // a logon SID or in case of an error.
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 116
117 absolute_sd->Swap(local_absolute_sd); 117 absolute_sd->Swap(local_absolute_sd);
118 dacl->Swap(local_dacl); 118 dacl->Swap(local_dacl);
119 group->Swap(local_group); 119 group->Swap(local_group);
120 owner->Swap(local_owner); 120 owner->Swap(local_owner);
121 sacl->Swap(local_sacl); 121 sacl->Swap(local_sacl);
122 return true; 122 return true;
123 } 123 }
124 124
125 } // namespace remoting 125 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/win/launch_process_with_token.cc ('k') | sandbox/win/src/handle_closer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698