OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <windows.h> | 5 #include <windows.h> |
6 #include <shellapi.h> | 6 #include <shellapi.h> |
7 | 7 |
8 #include "chrome/browser/views/tab_icon_view.h" | 8 #include "chrome/browser/views/tab_icon_view.h" |
9 | 9 |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 PaintFavIcon(canvas, favicon); | 120 PaintFavIcon(canvas, favicon); |
121 } | 121 } |
122 } | 122 } |
123 } | 123 } |
124 | 124 |
125 if (!rendered) { | 125 if (!rendered) { |
126 PaintFavIcon(canvas, *g_default_fav_icon); | 126 PaintFavIcon(canvas, *g_default_fav_icon); |
127 } | 127 } |
128 } | 128 } |
129 | 129 |
130 void TabIconView::GetPreferredSize(CSize* out) { | 130 gfx::Size TabIconView::GetPreferredSize() { |
131 out->cx = out->cy = kFavIconSize; | 131 return gfx::Size(kFavIconSize, kFavIconSize); |
132 } | 132 } |
133 | 133 |
OLD | NEW |