| 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/test_table_model.h" | 5 #include "ui/views/controls/table/test_table_model.h" |
| 6 | 6 |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "third_party/skia/include/core/SkBitmap.h" | 9 #include "third_party/skia/include/core/SkBitmap.h" |
| 10 #include "ui/base/models/table_model_observer.h" | 10 #include "ui/base/models/table_model_observer.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 return row_count_; | 22 return row_count_; |
| 23 } | 23 } |
| 24 | 24 |
| 25 base::string16 TestTableModel::GetText(int row, int column_id) { | 25 base::string16 TestTableModel::GetText(int row, int column_id) { |
| 26 return base::ASCIIToUTF16(base::IntToString(row) + "x" + | 26 return base::ASCIIToUTF16(base::IntToString(row) + "x" + |
| 27 base::IntToString(column_id)); | 27 base::IntToString(column_id)); |
| 28 } | 28 } |
| 29 | 29 |
| 30 gfx::ImageSkia TestTableModel::GetIcon(int row) { | 30 gfx::ImageSkia TestTableModel::GetIcon(int row) { |
| 31 SkBitmap bitmap; | 31 SkBitmap bitmap; |
| 32 bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16); | 32 bitmap.setInfo(SkImageInfo::MakeN32Premul(16, 16)); |
| 33 return gfx::ImageSkia::CreateFrom1xBitmap(bitmap); | 33 return gfx::ImageSkia::CreateFrom1xBitmap(bitmap); |
| 34 } | 34 } |
| 35 | 35 |
| 36 void TestTableModel::SetObserver(ui::TableModelObserver* observer) { | 36 void TestTableModel::SetObserver(ui::TableModelObserver* observer) { |
| 37 observer_ = observer; | 37 observer_ = observer; |
| 38 } | 38 } |
| OLD | NEW |