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

Unified Diff: views/controls/table/native_table_win.cc

Issue 7790009: views: Fix a couple of other trivial TODOs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « views/controls/table/native_table_win.h ('k') | views/controls/table/native_table_wrapper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/table/native_table_win.cc
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index 086675d8f394eb36172cf32cc430e7af71834448..209959d8e408aa9bd8eb4d223f10e79a6cfd97e1 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -20,8 +20,6 @@
#include "views/controls/table/table_view_observer.h"
#include "views/widget/widget.h"
-using ui::TableColumn;
-
namespace views {
// Added to column width to prevent truncation.
@@ -59,7 +57,7 @@ int NativeTableWin::GetRowCount() const {
return ListView_GetItemCount(native_view());
}
-void NativeTableWin::InsertColumn(const TableColumn& tc, int index) {
+void NativeTableWin::InsertColumn(const ui::TableColumn& tc, int index) {
if (!native_view())
return;
@@ -67,13 +65,13 @@ void NativeTableWin::InsertColumn(const TableColumn& tc, int index) {
column.mask = LVCF_TEXT|LVCF_FMT;
column.pszText = const_cast<LPWSTR>(tc.title.c_str());
switch (tc.alignment) {
- case TableColumn::LEFT:
+ case ui::TableColumn::LEFT:
column.fmt = LVCFMT_LEFT;
break;
- case TableColumn::RIGHT:
+ case ui::TableColumn::RIGHT:
column.fmt = LVCFMT_RIGHT;
break;
- case TableColumn::CENTER:
+ case ui::TableColumn::CENTER:
column.fmt = LVCFMT_CENTER;
break;
default:
@@ -292,7 +290,7 @@ bool NativeTableWin::ProcessMessage(UINT message, WPARAM w_param,
break;
case LVN_COLUMNCLICK: {
- const TableColumn& column = table_->GetVisibleColumnAt(
+ const ui::TableColumn& column = table_->GetVisibleColumnAt(
reinterpret_cast<NMLISTVIEW*>(hdr)->iSubItem);
break;
}
@@ -585,7 +583,7 @@ void NativeTableWin::UpdateListViewCache(int start, int length, bool add) {
item.mask |= LVIF_IMAGE;
for (size_t j = start_column; j < table_->GetVisibleColumnCount(); ++j) {
- TableColumn col = table_->GetVisibleColumnAt(j);
+ ui::TableColumn col = table_->GetVisibleColumnAt(j);
int max_text_width = ListView_GetStringWidth(native_view(),
col.title.c_str());
for (int i = start; i < max_row; ++i) {
« no previous file with comments | « views/controls/table/native_table_win.h ('k') | views/controls/table/native_table_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698