summaryrefslogtreecommitdiffstats
path: root/extensions/common/extension.h
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/common/extension.h
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/common/extension.h')
-rw-r--r--extensions/common/extension.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/extensions/common/extension.h b/extensions/common/extension.h
index 4da7a03..fb2cf4c 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