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

Unified Diff: chrome/browser/dom_ui/new_tab_ui.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/dom_ui/history_ui.cc ('k') | chrome/browser/dom_ui/print_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/new_tab_ui.cc
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 4f5bada74b0230d2c8b7fae433bf53e0cf8bb13b..93fc8cb4f74b0106a1dd4a2adac8625b01357cf6 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -421,12 +421,12 @@ void NewTabHTMLSource::InitFullHTML() {
// In case we have the new new tab page enabled we first try to read the file
// provided on the command line. If that fails we just get the resource from
// the resource bundle.
- StringPiece new_tab_html;
+ base::StringPiece new_tab_html;
std::string new_tab_html_str;
new_tab_html_str = GetCustomNewTabPageFromCommandLine();
if (!new_tab_html_str.empty()) {
- new_tab_html = StringPiece(new_tab_html_str);
+ new_tab_html = base::StringPiece(new_tab_html_str);
}
if (new_tab_html.empty()) {
@@ -510,7 +510,7 @@ void IncognitoTabHTMLSource::InitFullHTML() {
SetFontAndTextDirection(&localized_strings);
- static const StringPiece incognito_tab_html(
+ static const base::StringPiece incognito_tab_html(
ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_INCOGNITO_TAB_HTML));
« no previous file with comments | « chrome/browser/dom_ui/history_ui.cc ('k') | chrome/browser/dom_ui/print_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698