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

Unified Diff: ui/views/controls/table/table_view.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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 | « ui/views/controls/table/table_view.h ('k') | ui/views/controls/table/table_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/table/table_view.cc
diff --git a/ui/views/controls/table/table_view.cc b/ui/views/controls/table/table_view.cc
index 8a27a1f7a91a7b825dc035bba0aaacffb46183ab..a23c9814d29d36ef59bde79288194c6be135a141 100644
--- a/ui/views/controls/table/table_view.cc
+++ b/ui/views/controls/table/table_view.cc
@@ -404,7 +404,7 @@ void TableView::OnGestureEvent(ui::GestureEvent* event) {
}
bool TableView::GetTooltipText(const gfx::Point& p,
- string16* tooltip) const {
+ base::string16* tooltip) const {
return GetTooltipImpl(p, tooltip, NULL);
}
@@ -871,7 +871,7 @@ GroupRange TableView::GetGroupRange(int model_index) const {
}
bool TableView::GetTooltipImpl(const gfx::Point& location,
- string16* tooltip,
+ base::string16* tooltip,
gfx::Point* tooltip_origin) const {
const int row = location.y() / row_height_;
if (row < 0 || row >= RowCount() || visible_columns_.empty())
@@ -883,7 +883,7 @@ bool TableView::GetTooltipImpl(const gfx::Point& location,
x > (visible_columns_[column].x + visible_columns_[column].width))
return false;
- const string16 text(model_->GetText(ViewToModel(row),
+ const base::string16 text(model_->GetText(ViewToModel(row),
visible_columns_[column].column.id));
if (text.empty())
return false;
« no previous file with comments | « ui/views/controls/table/table_view.h ('k') | ui/views/controls/table/table_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698