diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
commit | fcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch) | |
tree | d41b14e6526a822b66d692f60dc8f648a2afb3cd /content/common/sandbox_win.cc | |
parent | 426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff) | |
download | chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2 |
Convert string16 to base::string16 in content.
BUG=
Review URL: https://codereview.chromium.org/102593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/sandbox_win.cc')
-rw-r--r-- | content/common/sandbox_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc index f5c86f7..cf13a1d 100644 --- a/content/common/sandbox_win.cc +++ b/content/common/sandbox_win.cc @@ -217,7 +217,7 @@ void AddGenericDllEvictionPolicy(sandbox::TargetPolicy* policy) { } // Returns the object path prepended with the current logon session. -string16 PrependWindowsSessionPath(const char16* object) { +base::string16 PrependWindowsSessionPath(const char16* object) { // Cache this because it can't change after process creation. static uintptr_t s_session_id = 0; if (s_session_id == 0) { @@ -514,7 +514,7 @@ void SetJobLevel(const CommandLine& cmd_line, // Just have to figure out what needs to be warmed up first. void AddBaseHandleClosePolicy(sandbox::TargetPolicy* policy) { // TODO(cpu): Add back the BaseNamedObjects policy. - string16 object_path = PrependWindowsSessionPath( + base::string16 object_path = PrependWindowsSessionPath( L"\\BaseNamedObjects\\windows_shell_global_counters"); policy->AddKernelObjectToClose(L"Section", object_path.data()); } |