| 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 #ifndef UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ | 5 #ifndef UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ |
| 6 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ | 6 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "third_party/skia/include/core/SkColor.h" | 9 #include "third_party/skia/include/core/SkColor.h" |
| 9 #include "ui/gfx/image/image_skia.h" | 10 #include "ui/gfx/image/image_skia.h" |
| 10 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 11 | 12 |
| 12 namespace gfx { | 13 namespace gfx { |
| 13 class Canvas; | 14 class Canvas; |
| 14 } | 15 } |
| 15 | 16 |
| 16 namespace views { | 17 namespace views { |
| 17 | 18 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 void* last_painted_bitmap_pixels_; | 134 void* last_painted_bitmap_pixels_; |
| 134 | 135 |
| 135 scoped_ptr<views::Painter> focus_painter_; | 136 scoped_ptr<views::Painter> focus_painter_; |
| 136 | 137 |
| 137 DISALLOW_COPY_AND_ASSIGN(ImageView); | 138 DISALLOW_COPY_AND_ASSIGN(ImageView); |
| 138 }; | 139 }; |
| 139 | 140 |
| 140 } // namespace views | 141 } // namespace views |
| 141 | 142 |
| 142 #endif // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ | 143 #endif // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1543173002:
Switch to standard integer types in ui/views/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master