| Index: chrome/views/image_view.h
|
| ===================================================================
|
| --- chrome/views/image_view.h (revision 3391)
|
| +++ chrome/views/image_view.h (working copy)
|
| @@ -48,12 +48,12 @@
|
| const SkBitmap& GetImage();
|
|
|
| // Set the desired image size for the receiving ImageView.
|
| - void SetImageSize(const CSize& image_size);
|
| + void SetImageSize(const gfx::Size& image_size);
|
|
|
| // Return the preferred size for the receiving view. Returns false if the
|
| // preferred size is not defined, which means that the view uses the image
|
| // size.
|
| - bool GetImageSize(CSize* image_size);
|
| + bool GetImageSize(gfx::Size* image_size);
|
|
|
| // Reset the image size to the current image dimensions.
|
| void ResetImageSize();
|
| @@ -72,7 +72,7 @@
|
|
|
| // Return whether the image should be centered inside the view.
|
| // Overriden from View
|
| - virtual void GetPreferredSize(CSize* out);
|
| + virtual gfx::Size GetPreferredSize();
|
| virtual void Paint(ChromeCanvas* canvas);
|
|
|
| // Overriden from View.
|
| @@ -87,7 +87,7 @@
|
| bool image_size_set_;
|
|
|
| // The actual image size.
|
| - CSize image_size_;
|
| + gfx::Size image_size_;
|
|
|
| // The underlying bitmap.
|
| SkBitmap image_;
|
|
|