summaryrefslogtreecommitdiffstats
path: root/extensions/browser/test_management_policy.cc
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 23:48:36 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 23:48:36 +0000
commit0d163dc35365d2ae4b2a3dc8281f3ba8ee7be88e (patch)
tree1a93cdeebef0515893b2e46e128b0bffc7db4648 /extensions/browser/test_management_policy.cc
parent74aba36cbf2749781784c705fb04e2bd7716cdff (diff)
downloadchromium_src-0d163dc35365d2ae4b2a3dc8281f3ba8ee7be88e.zip
chromium_src-0d163dc35365d2ae4b2a3dc8281f3ba8ee7be88e.tar.gz
chromium_src-0d163dc35365d2ae4b2a3dc8281f3ba8ee7be88e.tar.bz2
Add base:: to string16 in extensions/.
R=yoz@chromium.org BUG=329295 Review URL: https://codereview.chromium.org/107803004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/test_management_policy.cc')
-rw-r--r--extensions/browser/test_management_policy.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/extensions/browser/test_management_policy.cc b/extensions/browser/test_management_policy.cc
index a2c5404..5c78efe 100644
--- a/extensions/browser/test_management_policy.cc
+++ b/extensions/browser/test_management_policy.cc
@@ -41,21 +41,22 @@ std::string TestManagementPolicyProvider::GetDebugPolicyProviderName() const {
}
bool TestManagementPolicyProvider::UserMayLoad(const Extension* extension,
- string16* error) const {
+ base::string16* error) const {
if (error && !may_load_)
*error = error_message_;
return may_load_;
}
bool TestManagementPolicyProvider::UserMayModifySettings(
- const Extension* extension, string16* error) const {
+ const Extension* extension, base::string16* error) const {
if (error && !may_modify_status_)
*error = error_message_;
return may_modify_status_;
}
bool TestManagementPolicyProvider::MustRemainEnabled(const Extension* extension,
- string16* error) const {
+ base::string16* error)
+ const {
if (error && must_remain_enabled_)
*error = error_message_;
return must_remain_enabled_;
@@ -64,7 +65,7 @@ bool TestManagementPolicyProvider::MustRemainEnabled(const Extension* extension,
bool TestManagementPolicyProvider::MustRemainDisabled(
const Extension* extension,
Extension::DisableReason* reason,
- string16* error) const {
+ base::string16* error) const {
if (must_remain_disabled_) {
if (error)
*error = error_message_;