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

Unified Diff: extensions/browser/extension_error.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_unittest.cc ('k') | extensions/browser/management_policy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/extension_error.cc
diff --git a/extensions/browser/extension_error.cc b/extensions/browser/extension_error.cc
index ee6b47e58ad37e3ffc8f6fc845bfd22ba1ac318d..d8733fe51dc0234222f57984b487615512137855 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,
« no previous file with comments | « extensions/browser/admin_policy_unittest.cc ('k') | extensions/browser/management_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698