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

Unified Diff: chrome/common/extensions/user_script.h

Issue 193072: Move StringPiece into the base namespace. It is colliding (Closed)
Patch Set: take 2 Created 11 years, 3 months 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 | « chrome/browser/views/sync/sync_setup_wizard.cc ('k') | chrome/common/jstemplate_builder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/user_script.h
diff --git a/chrome/common/extensions/user_script.h b/chrome/common/extensions/user_script.h
index 7416472da708be9e1ceb345f4687273a3f8b6d53..4b5717996d4b6ccca791792cd9beac5292b30800 100644
--- a/chrome/common/extensions/user_script.h
+++ b/chrome/common/extensions/user_script.h
@@ -48,16 +48,16 @@ class UserScript {
// If external_content_ is set returns it as content otherwise it returns
// content_
- const StringPiece GetContent() const {
+ const base::StringPiece GetContent() const {
if (external_content_.data())
return external_content_;
else
return content_;
}
- void set_external_content(const StringPiece& content) {
+ void set_external_content(const base::StringPiece& content) {
external_content_ = content;
}
- const void set_content(const StringPiece& content) {
+ const void set_content(const base::StringPiece& content) {
content_.assign(content.begin(), content.end());
}
@@ -75,7 +75,7 @@ class UserScript {
// The script content. It can be set to either loaded_content_ or
// externally allocated string.
- StringPiece external_content_;
+ base::StringPiece external_content_;
// Set when the content is loaded by LoadContent
std::string content_;
« no previous file with comments | « chrome/browser/views/sync/sync_setup_wizard.cc ('k') | chrome/common/jstemplate_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698