summaryrefslogtreecommitdiffstats
path: root/extensions/browser/extension_error.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/extension_error.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/extension_error.cc')
-rw-r--r--extensions/browser/extension_error.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/extensions/browser/extension_error.cc b/extensions/browser/extension_error.cc
index ee6b47e..d8733fe 100644
--- a/extensions/browser/extension_error.cc
+++ b/extensions/browser/extension_error.cc
@@ -10,7 +10,6 @@
#include "extensions/common/constants.h"
#include "url/gurl.h"
-using base::string16;
using base::DictionaryValue;
namespace extensions {
@@ -30,8 +29,8 @@ ExtensionError::ExtensionError(Type type,
const std::string& extension_id,
bool from_incognito,
logging::LogSeverity level,
- const string16& source,
- const string16& message)
+ const base::string16& source,
+ const base::string16& message)
: type_(type),
extension_id_(extension_id),
from_incognito_(from_incognito),
@@ -84,9 +83,9 @@ const char ManifestError::kManifestKeyKey[] = "manifestKey";
const char ManifestError::kManifestSpecificKey[] = "manifestSpecific";
ManifestError::ManifestError(const std::string& extension_id,
- const string16& message,
- const string16& manifest_key,
- const string16& manifest_specific)
+ const base::string16& message,
+ const base::string16& manifest_key,
+ const base::string16& manifest_specific)
: ExtensionError(ExtensionError::MANIFEST_ERROR,
extension_id,
false, // extensions can't be installed while incognito.
@@ -135,8 +134,8 @@ const char RuntimeError::kRenderViewIdKey[] = "renderViewId";
RuntimeError::RuntimeError(const std::string& extension_id,
bool from_incognito,
- const string16& source,
- const string16& message,
+ const base::string16& source,
+ const base::string16& message,
const StackTrace& stack_trace,
const GURL& context_url,
logging::LogSeverity level,