| 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 "chrome/browser/ui/views/tab_icon_view.h" | 5 #include "chrome/browser/ui/views/tab_icon_view.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif | 10 #endif |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 if (!favicon.isNull()) { | 148 if (!favicon.isNull()) { |
| 149 rendered = true; | 149 rendered = true; |
| 150 PaintFavicon(canvas, favicon); | 150 PaintFavicon(canvas, favicon); |
| 151 } | 151 } |
| 152 } | 152 } |
| 153 | 153 |
| 154 if (!rendered) | 154 if (!rendered) |
| 155 PaintFavicon(canvas, *g_default_favicon); | 155 PaintFavicon(canvas, *g_default_favicon); |
| 156 } | 156 } |
| 157 | 157 |
| 158 gfx::Size TabIconView::GetPreferredSize() { | 158 gfx::Size TabIconView::GetPreferredSize() const { |
| 159 return gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize); | 159 return gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize); |
| 160 } | 160 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 273223002:
views: Make view::Views::GetPreferredSize() const. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src