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

Unified Diff: chrome/browser/custom_home_pages_table_model.cc

Issue 105193002: Replace string16 with base::string16. (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
« no previous file with comments | « chrome/browser/custom_home_pages_table_model.h ('k') | chrome/browser/devtools/devtools_file_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/custom_home_pages_table_model.cc
diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc
index c2cdfa196ad8305fa68b4b11631a6bb0731e1826..9b7b861236ab549ba453483a345558aa1c7cead5 100644
--- a/chrome/browser/custom_home_pages_table_model.cc
+++ b/chrome/browser/custom_home_pages_table_model.cc
@@ -61,7 +61,7 @@ struct CustomHomePagesTableModel::Entry {
GURL url;
// Page title. If this is empty, we'll display the URL as the entry.
- string16 title;
+ base::string16 title;
// If non-zero, indicates we're loading the title for the page.
HistoryService::Handle title_handle;
@@ -211,7 +211,7 @@ string16 CustomHomePagesTableModel::GetText(int row, int column_id) {
}
string16 CustomHomePagesTableModel::GetTooltip(int row) {
- return entries_[row].title.empty() ? string16() :
+ return entries_[row].title.empty() ? base::string16() :
l10n_util::GetStringFUTF16(IDS_OPTIONS_STARTUP_PAGE_TOOLTIP,
entries_[row].title, FormattedURL(row));
}
@@ -267,7 +267,7 @@ CustomHomePagesTableModel::Entry*
string16 CustomHomePagesTableModel::FormattedURL(int row) const {
std::string languages =
profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
- string16 url = net::FormatUrl(entries_[row].url, languages);
+ base::string16 url = net::FormatUrl(entries_[row].url, languages);
url = base::i18n::GetDisplayStringInLTRDirectionality(url);
return url;
}
« no previous file with comments | « chrome/browser/custom_home_pages_table_model.h ('k') | chrome/browser/devtools/devtools_file_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698