Index: sandbox/win/src/sandbox_policy_base.h |
diff --git a/sandbox/win/src/sandbox_policy_base.h b/sandbox/win/src/sandbox_policy_base.h |
index d56501d78bc23739f6783ee14cbe857ad11a4932..79695061c2ff65bed6b71b525b7ac1701d1ab00c 100644 |
--- a/sandbox/win/src/sandbox_policy_base.h |
+++ b/sandbox/win/src/sandbox_policy_base.h |
@@ -44,7 +44,7 @@ class PolicyBase : public Dispatcher, public TargetPolicy { |
virtual ResultCode SetJobLevel(JobLevel job_level, |
uint32 ui_exceptions) OVERRIDE; |
virtual ResultCode SetAlternateDesktop(bool alternate_winstation) OVERRIDE; |
- virtual string16 GetAlternateDesktop() const OVERRIDE; |
+ virtual base::string16 GetAlternateDesktop() const OVERRIDE; |
virtual ResultCode CreateAlternateDesktop(bool alternate_winstation) OVERRIDE; |
virtual void DestroyAlternateDesktop() OVERRIDE; |
virtual ResultCode SetIntegrityLevel(IntegrityLevel integrity_level) OVERRIDE; |
@@ -141,12 +141,12 @@ class PolicyBase : public Dispatcher, public TargetPolicy { |
// Memory structure that stores the low level policy. |
PolicyGlobal* policy_; |
// The list of dlls to unload in the target process. |
- std::vector<string16> blacklisted_dlls_; |
+ std::vector<base::string16> blacklisted_dlls_; |
// This is a map of handle-types to names that we need to close in the |
// target process. A null set means we need to close all handles of the |
// given type. |
HandleCloser handle_closer_; |
- std::vector<string16> capabilities_; |
+ std::vector<base::string16> capabilities_; |
scoped_ptr<AppContainerAttributes> appcontainer_list_; |
static HDESK alternate_desktop_handle_; |