| commit | 0d163dc35365d2ae4b2a3dc8281f3ba8ee7be88e | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Dec 20 23:48:36 2013 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Dec 20 23:48:36 2013 |
| tree | 1a93cdeebef0515893b2e46e128b0bffc7db4648 | |
| parent | 74aba36cbf2749781784c705fb04e2bd7716cdff [diff] [blame] |
Add base:: to string16 in extensions/. [email protected] 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
diff --git a/extensions/common/manifest_handlers/csp_info.cc b/extensions/common/manifest_handlers/csp_info.cc index 79f531a4f..842a640 100644 --- a/extensions/common/manifest_handlers/csp_info.cc +++ b/extensions/common/manifest_handlers/csp_info.cc
@@ -77,7 +77,7 @@ CSPHandler::~CSPHandler() { } -bool CSPHandler::Parse(Extension* extension, string16* error) { +bool CSPHandler::Parse(Extension* extension, base::string16* error) { const std::string key = Keys()[0]; if (!extension->manifest()->HasPath(key)) { if (extension->manifest_version() >= 2) {