| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "views/controls/image_view.h" | 5 #include "views/controls/image_view.h" |
| 6 | 6 |
| 7 #include "app/gfx/canvas.h" | |
| 8 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "gfx/canvas.h" |
| 9 #include "gfx/insets.h" | 9 #include "gfx/insets.h" |
| 10 | 10 |
| 11 namespace views { | 11 namespace views { |
| 12 | 12 |
| 13 ImageView::ImageView() | 13 ImageView::ImageView() |
| 14 : image_size_set_(false), | 14 : image_size_set_(false), |
| 15 horiz_alignment_(CENTER), | 15 horiz_alignment_(CENTER), |
| 16 vert_alignment_(CENTER) { | 16 vert_alignment_(CENTER) { |
| 17 } | 17 } |
| 18 | 18 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 | 182 |
| 183 bool ImageView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) { | 183 bool ImageView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) { |
| 184 if (tooltip_text_.empty()) | 184 if (tooltip_text_.empty()) |
| 185 return false; | 185 return false; |
| 186 | 186 |
| 187 *tooltip = GetTooltipText(); | 187 *tooltip = GetTooltipText(); |
| 188 return true; | 188 return true; |
| 189 } | 189 } |
| 190 | 190 |
| 191 } // namespace views | 191 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1132006:
Move app/gfx/canvas and app/gfx/font to gfx/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/