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

Unified Diff: extensions/browser/admin_policy.cc

Issue 107803004: Add base:: to string16 in extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove a using Created 7 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/browser/admin_policy.h ('k') | extensions/browser/admin_policy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/admin_policy.cc
diff --git a/extensions/browser/admin_policy.cc b/extensions/browser/admin_policy.cc
index 903c4e09565d85fdeded29cd94bf42d5223eed8a..0513eb930d8416cbdf004874f81586555a2449fd 100644
--- a/extensions/browser/admin_policy.cc
+++ b/extensions/browser/admin_policy.cc
@@ -13,7 +13,7 @@
namespace {
bool ManagementPolicyImpl(const extensions::Extension* extension,
- string16* error,
+ base::string16* error,
bool modifiable_value) {
bool modifiable =
extension->location() != extensions::Manifest::COMPONENT &&
@@ -30,7 +30,8 @@ bool ManagementPolicyImpl(const extensions::Extension* extension,
return !modifiable_value;
}
-bool ReturnLoadError(const extensions::Extension* extension, string16* error) {
+bool ReturnLoadError(const extensions::Extension* extension,
+ base::string16* error) {
if (error) {
*error = l10n_util::GetStringFUTF16(
IDS_EXTENSION_CANT_INSTALL_POLICY_BLOCKED,
@@ -55,7 +56,7 @@ bool UserMayLoad(const base::ListValue* blacklist,
const base::DictionaryValue* forcelist,
const base::ListValue* allowed_types,
const Extension* extension,
- string16* error) {
+ base::string16* error) {
// Component extensions are always allowed.
if (extension->location() == Manifest::COMPONENT)
return true;
@@ -109,11 +110,11 @@ bool UserMayLoad(const base::ListValue* blacklist,
return true;
}
-bool UserMayModifySettings(const Extension* extension, string16* error) {
+bool UserMayModifySettings(const Extension* extension, base::string16* error) {
return ManagementPolicyImpl(extension, error, true);
}
-bool MustRemainEnabled(const Extension* extension, string16* error) {
+bool MustRemainEnabled(const Extension* extension, base::string16* error) {
return ManagementPolicyImpl(extension, error, false);
}
« no previous file with comments | « extensions/browser/admin_policy.h ('k') | extensions/browser/admin_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698