| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "third_party/skia/include/core/SkBitmap.h" | 9 #include "third_party/skia/include/core/SkBitmap.h" |
| 10 #include "views/view.h" | 10 #include "ui/views/view.h" |
| 11 | 11 |
| 12 namespace gfx { | 12 namespace gfx { |
| 13 class Canvas; | 13 class Canvas; |
| 14 } | 14 } |
| 15 | 15 |
| 16 namespace views { | 16 namespace views { |
| 17 | 17 |
| 18 ///////////////////////////////////////////////////////////////////////////// | 18 ///////////////////////////////////////////////////////////////////////////// |
| 19 // | 19 // |
| 20 // ImageView class. | 20 // ImageView class. |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 103 |
| 104 // The current tooltip text. | 104 // The current tooltip text. |
| 105 string16 tooltip_text_; | 105 string16 tooltip_text_; |
| 106 | 106 |
| 107 DISALLOW_COPY_AND_ASSIGN(ImageView); | 107 DISALLOW_COPY_AND_ASSIGN(ImageView); |
| 108 }; | 108 }; |
| 109 | 109 |
| 110 } // namespace views | 110 } // namespace views |
| 111 | 111 |
| 112 #endif // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ | 112 #endif // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 8742030:
views: Move view.h to ui/views/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src