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

Unified Diff: components/policy/core/browser/policy_error_map.h

Issue 107383002: Use base namespace for string16 in components and cloud_print. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: components/policy/core/browser/policy_error_map.h
diff --git a/components/policy/core/browser/policy_error_map.h b/components/policy/core/browser/policy_error_map.h
index afc9706e93b40413024e7f4738437994eb83f748..d3cc7479bcc3589266ff8742b0ddfe872d7fca7a 100644
--- a/components/policy/core/browser/policy_error_map.h
+++ b/components/policy/core/browser/policy_error_map.h
@@ -18,7 +18,7 @@ namespace policy {
// Collects error messages and their associated policies.
class POLICY_EXPORT PolicyErrorMap {
public:
- typedef std::multimap<std::string, string16> PolicyMapType;
+ typedef std::multimap<std::string, base::string16> PolicyMapType;
typedef PolicyMapType::const_iterator const_iterator;
PolicyErrorMap();
@@ -70,7 +70,7 @@ class POLICY_EXPORT PolicyErrorMap {
// Returns all the error messages stored for |policy|, separated by a white
// space. Returns an empty string if there are no errors for |policy|.
- string16 GetErrors(const std::string& policy);
+ base::string16 GetErrors(const std::string& policy);
bool empty();
size_t size();
« no previous file with comments | « components/plugins/renderer/plugin_placeholder.cc ('k') | components/policy/core/browser/policy_error_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698