Index: extensions/common/extension.h |
diff --git a/extensions/common/extension.h b/extensions/common/extension.h |
index 4da7a03625e7c02d4f2093254aaf007fb9e49afd..fb2cf4c429cea6e5a7793ede64a8b1ddd478d666 100644 |
--- a/extensions/common/extension.h |
+++ b/extensions/common/extension.h |
@@ -341,7 +341,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> { |
const base::FilePath& path, |
const std::string& explicit_id, |
int creation_flags, |
- string16* error); |
+ base::string16* error); |
Extension(const base::FilePath& path, |
scoped_ptr<extensions::Manifest> manifest); |
@@ -353,28 +353,28 @@ class Extension : public base::RefCountedThreadSafe<Extension> { |
// of the underlying DictionaryValue in its members. We should decide to |
// either wrap the DictionaryValue and go with that only, or we should parse |
// into strong types and discard the value. But doing both is bad. |
- bool InitFromValue(int flags, string16* error); |
+ bool InitFromValue(int flags, base::string16* error); |
// The following are helpers for InitFromValue to load various features of the |
// extension from the manifest. |
- bool LoadRequiredFeatures(string16* error); |
- bool LoadName(string16* error); |
- bool LoadVersion(string16* error); |
+ bool LoadRequiredFeatures(base::string16* error); |
+ bool LoadName(base::string16* error); |
+ bool LoadVersion(base::string16* error); |
- bool LoadAppFeatures(string16* error); |
+ bool LoadAppFeatures(base::string16* error); |
bool LoadExtent(const char* key, |
URLPatternSet* extent, |
const char* list_error, |
const char* value_error, |
- string16* error); |
+ base::string16* error); |
- bool LoadSharedFeatures(string16* error); |
- bool LoadDescription(string16* error); |
- bool LoadManifestVersion(string16* error); |
- bool LoadShortName(string16* error); |
+ bool LoadSharedFeatures(base::string16* error); |
+ bool LoadDescription(base::string16* error); |
+ bool LoadManifestVersion(base::string16* error); |
+ bool LoadShortName(base::string16* error); |
- bool CheckMinimumChromeVersion(string16* error) const; |
+ bool CheckMinimumChromeVersion(base::string16* error) const; |
// The extension's human-readable name. Name is used for display purpose. It |
// might be wrapped with unicode bidi control characters so that it is |