| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "ui/views/controls/table/table_utils.h" | 5 #include "ui/views/controls/table/table_utils.h" | 
| 6 | 6 | 
|  | 7 #include <stddef.h> | 
|  | 8 | 
| 7 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" | 
| 8 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" | 
| 9 #include "ui/gfx/font_list.h" | 11 #include "ui/gfx/font_list.h" | 
| 10 #include "ui/views/controls/table/test_table_model.h" | 12 #include "ui/views/controls/table/test_table_model.h" | 
| 11 | 13 | 
| 12 using ui::TableColumn; | 14 using ui::TableColumn; | 
| 13 using ui::TableModel; | 15 using ui::TableModel; | 
| 14 | 16 | 
| 15 namespace views { | 17 namespace views { | 
| 16 | 18 | 
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 115   result = CalculateTableColumnSizes( | 117   result = CalculateTableColumnSizes( | 
| 116       result[0] + result[1], 0, font_list, font_list, 0, 0, columns, &model); | 118       result[0] + result[1], 0, font_list, font_list, 0, 0, columns, &model); | 
| 117   EXPECT_EQ(result[0], | 119   EXPECT_EQ(result[0], | 
| 118             WidthForContent(font_list, font_list, 0, 0, columns[0], &model)); | 120             WidthForContent(font_list, font_list, 0, 0, columns[0], &model)); | 
| 119   EXPECT_EQ(result[1], | 121   EXPECT_EQ(result[1], | 
| 120             WidthForContent(font_list, font_list, 0, 0, columns[1], &model)); | 122             WidthForContent(font_list, font_list, 0, 0, columns[1], &model)); | 
| 121   EXPECT_EQ(kUnspecifiedColumnWidth, result[2]); | 123   EXPECT_EQ(kUnspecifiedColumnWidth, result[2]); | 
| 122 } | 124 } | 
| 123 | 125 | 
| 124 }  // namespace views | 126 }  // namespace views | 
| OLD | NEW | 
|---|