| 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 "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "gfx/canvas.h" | 9 #include "ui/gfx/canvas.h" |
| 10 #include "gfx/insets.h" | 10 #include "ui/gfx/insets.h" |
| 11 | 11 |
| 12 namespace views { | 12 namespace views { |
| 13 | 13 |
| 14 ImageView::ImageView() | 14 ImageView::ImageView() |
| 15 : image_size_set_(false), | 15 : image_size_set_(false), |
| 16 horiz_alignment_(CENTER), | 16 horiz_alignment_(CENTER), |
| 17 vert_alignment_(CENTER) { | 17 vert_alignment_(CENTER) { |
| 18 } | 18 } |
| 19 | 19 |
| 20 ImageView::~ImageView() { | 20 ImageView::~ImageView() { |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 | 163 |
| 164 bool ImageView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) { | 164 bool ImageView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) { |
| 165 if (tooltip_text_.empty()) | 165 if (tooltip_text_.empty()) |
| 166 return false; | 166 return false; |
| 167 | 167 |
| 168 *tooltip = GetTooltipText(); | 168 *tooltip = GetTooltipText(); |
| 169 return true; | 169 return true; |
| 170 } | 170 } |
| 171 | 171 |
| 172 } // namespace views | 172 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6312156:
Change includes of gfx/* to ui/gfx/* (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/