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

Unified Diff: chrome/browser/views/sync/sync_setup_wizard.cc

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/ssl/ssl_policy.cc ('k') | chrome/common/extensions/user_script.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/sync/sync_setup_wizard.cc
diff --git a/chrome/browser/views/sync/sync_setup_wizard.cc b/chrome/browser/views/sync/sync_setup_wizard.cc
index 0421e4e3d049d6d82d9049120a3272f31f9bdf1c..3b187f7b66271f4ff8231e8f6e4a5580c62f9829 100644
--- a/chrome/browser/views/sync/sync_setup_wizard.cc
+++ b/chrome/browser/views/sync/sync_setup_wizard.cc
@@ -49,15 +49,15 @@ void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
std::string response;
if (path_raw == chrome::kSyncGaiaLoginPath) {
- static const StringPiece html(ResourceBundle::GetSharedInstance()
+ static const base::StringPiece html(ResourceBundle::GetSharedInstance()
.GetRawDataResource(IDR_GAIA_LOGIN_HTML));
response = html.as_string();
} else if (path_raw == chrome::kSyncMergeAndSyncPath) {
- static const StringPiece html(ResourceBundle::GetSharedInstance()
+ static const base::StringPiece html(ResourceBundle::GetSharedInstance()
.GetRawDataResource(IDR_MERGE_AND_SYNC_HTML));
response = html.as_string();
} else if (path_raw == chrome::kSyncSetupFlowPath) {
- static const StringPiece html(ResourceBundle::GetSharedInstance()
+ static const base::StringPiece html(ResourceBundle::GetSharedInstance()
.GetRawDataResource(IDR_SYNC_SETUP_FLOW_HTML));
response = html.as_string();
}
« no previous file with comments | « chrome/browser/ssl/ssl_policy.cc ('k') | chrome/common/extensions/user_script.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698